summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2009-08-03 17:35:45 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:11:26 -0500
commit72c61d0bf4f1e014ce662f70b459c5a8abd7190d (patch)
treef7e83364948a0d06b16652796b5e55ecd5e4fe4e
parentdf59cbc6e2ff26d8fb4ffeea9742e9441ff1be35 (diff)
downloadfocaccia-qemu-72c61d0bf4f1e014ce662f70b459c5a8abd7190d.tar.gz
focaccia-qemu-72c61d0bf4f1e014ce662f70b459c5a8abd7190d.zip
qdev/prop: convert virtio-pci.c to helper macros.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id: 
-rw-r--r--hw/virtio-pci.c31
1 files changed, 8 insertions, 23 deletions
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 8cf4b57a38..8b57dfcb13 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -502,41 +502,26 @@ static PCIDeviceInfo virtio_info[] = {
         .qdev.size = sizeof(VirtIOPCIProxy),
         .init      = virtio_blk_init_pci,
         .qdev.props = (Property[]) {
-            {
-                .name   = "class",
-                .info   = &qdev_prop_hex32,
-                .offset = offsetof(VirtIOPCIProxy, class_code),
-            },{
-                .name   = "drive",
-                .info   = &qdev_prop_drive,
-                .offset = offsetof(VirtIOPCIProxy, dinfo),
-            },
-            {/* end of list */}
+            DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
+            DEFINE_PROP_DRIVE("drive", VirtIOPCIProxy, dinfo),
+            DEFINE_PROP_END_OF_LIST(),
         },
     },{
         .qdev.name  = "virtio-net-pci",
         .qdev.size  = sizeof(VirtIOPCIProxy),
         .init       = virtio_net_init_pci,
         .qdev.props = (Property[]) {
-            {
-                .name   = "vectors",
-                .info   = &qdev_prop_uint32,
-                .offset = offsetof(VirtIOPCIProxy, nvectors),
-                .defval = (uint32_t[]) { NIC_NVECTORS_UNSPECIFIED },
-            },
-            {/* end of list */}
+            DEFINE_PROP_HEX32("vectors", VirtIOPCIProxy, nvectors,
+                              NIC_NVECTORS_UNSPECIFIED),
+            DEFINE_PROP_END_OF_LIST(),
         },
     },{
         .qdev.name = "virtio-console-pci",
         .qdev.size = sizeof(VirtIOPCIProxy),
         .init      = virtio_console_init_pci,
         .qdev.props = (Property[]) {
-            {
-                .name   = "class",
-                .info   = &qdev_prop_hex32,
-                .offset = offsetof(VirtIOPCIProxy, class_code),
-            },
-            {/* end of list */}
+            DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
+            DEFINE_PROP_END_OF_LIST(),
         },
     },{
         .qdev.name = "virtio-balloon-pci",