From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MXzaI-0002ba-7d for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MXza1-0002CD-JG for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:11 -0400 Received: from [199.232.76.173] (port=39459 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MXza1-0002Bg-Dc for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:05 -0400 Received: from mx2.redhat.com ([66.187.237.31]:42793) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MXza0-0004gZ-SU for qemu-devel@nongnu.org; Mon, 03 Aug 2009 11:36:05 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n73Fa41M001567 for ; Mon, 3 Aug 2009 11:36:04 -0400 From: Gerd Hoffmann Date: Mon, 3 Aug 2009 17:35:45 +0200 Message-Id: <1249313748-6459-30-git-send-email-kraxel@redhat.com> In-Reply-To: <1249313748-6459-1-git-send-email-kraxel@redhat.com> References: <1249313748-6459-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 29/32] qdev/prop: convert virtio-pci.c to helper macros. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Signed-off-by: Gerd Hoffmann --- hw/virtio-pci.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c index 703f4fe..d05970f 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -498,37 +498,25 @@ 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), - }, - {/* end of list */} + DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0), + 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", -- 1.6.2.5