From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MWrnW-0000lL-22 for qemu-devel@nongnu.org; Fri, 31 Jul 2009 09:05:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MWrnQ-0000ik-4Q for qemu-devel@nongnu.org; Fri, 31 Jul 2009 09:05:20 -0400 Received: from [199.232.76.173] (port=50622 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MWrnP-0000iK-4I for qemu-devel@nongnu.org; Fri, 31 Jul 2009 09:05:15 -0400 Received: from mx2.redhat.com ([66.187.237.31]:52766) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MWrnO-0004Q6-3Z for qemu-devel@nongnu.org; Fri, 31 Jul 2009 09:05:14 -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 n6VD5BUd010046 for ; Fri, 31 Jul 2009 09:05:11 -0400 From: Gerd Hoffmann Date: Fri, 31 Jul 2009 15:04:59 +0200 Message-Id: <1249045499-10973-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1249045499-10973-1-git-send-email-kraxel@redhat.com> References: <1249045499-10973-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [RfC PATCH 2/2] qdev/prop: convert 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/pci.c | 9 ++------- hw/pci.h | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 4d0cdc7..27eac04 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -60,13 +60,8 @@ static struct BusInfo pci_bus_info = { .size = sizeof(PCIBus), .print_dev = pcibus_dev_print, .props = (Property[]) { - { - .name = "addr", - .info = &qdev_prop_pci_devfn, - .offset = offsetof(PCIDevice, devfn), - .defval = (uint32_t[]) { -1 }, - }, - {/* end of list */} + DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), + DEFINE_PROP_END_OF_LIST() } }; diff --git a/hw/pci.h b/hw/pci.h index cbfea6a..a2ec16a 100644 --- a/hw/pci.h +++ b/hw/pci.h @@ -177,7 +177,7 @@ struct PCIDevice { /* the following fields are read only */ PCIBus *bus; - int devfn; + uint32_t devfn; char name[64]; PCIIORegion io_regions[PCI_NUM_REGIONS]; -- 1.6.2.5