From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MR39E-0004hY-1p for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:59:44 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MR398-0004be-OZ for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:59:42 -0400 Received: from [199.232.76.173] (port=36732 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MR397-0004Zy-JU for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:59:37 -0400 Received: from mx2.redhat.com ([66.187.237.31]:59305) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MR396-0005ov-UK for qemu-devel@nongnu.org; Wed, 15 Jul 2009 07:59:37 -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 n6FBxZBC018193 for ; Wed, 15 Jul 2009 07:59:35 -0400 From: Gerd Hoffmann Date: Wed, 15 Jul 2009 13:59:23 +0200 Message-Id: <1247659167-1177-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1247659167-1177-1-git-send-email-kraxel@redhat.com> References: <1247659167-1177-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/6] qdev/pci: use qdev_prop_pci_devfn List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Put the new property into use. Signed-off-by: Gerd Hoffmann --- hw/pci.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 5e2996b..03c7840 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -56,8 +56,8 @@ static struct BusInfo pci_bus_info = { .print_dev = pcibus_dev_print, .props = (Property[]) { { - .name = "devfn", - .info = &qdev_prop_uint32, + .name = "addr", + .info = &qdev_prop_pci_devfn, .offset = offsetof(PCIDevice, devfn), .defval = (uint32_t[]) { -1 }, }, @@ -779,7 +779,7 @@ PCIDevice *pci_create(const char *name, const char *devaddr) } dev = qdev_create(&bus->qbus, name); - qdev_prop_set_uint32(dev, "devfn", devfn); + qdev_prop_set_uint32(dev, "addr", devfn); return (PCIDevice *)dev; } @@ -929,7 +929,7 @@ PCIDevice *pci_create_simple(PCIBus *bus, int devfn, const char *name) DeviceState *dev; dev = qdev_create(&bus->qbus, name); - qdev_prop_set_uint32(dev, "devfn", devfn); + qdev_prop_set_uint32(dev, "addr", devfn); qdev_init(dev); return (PCIDevice *)dev; -- 1.6.2.5