From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54802) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5mEJ-0004VX-Kz for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5mEI-0004J4-Nf for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47345) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5mEI-0004Ij-I9 for qemu-devel@nongnu.org; Thu, 18 Jun 2015 22:40:30 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 33EA035C126 for ; Fri, 19 Jun 2015 02:40:30 +0000 (UTC) From: Laszlo Ersek Date: Fri, 19 Jun 2015 04:40:10 +0200 Message-Id: <1434681617-15539-4-git-send-email-lersek@redhat.com> In-Reply-To: <1434681617-15539-1-git-send-email-lersek@redhat.com> References: <1434681617-15539-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v7 03/10] hw/pci-bridge: add macro for "chassis_nr" property List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, lersek@redhat.com Cc: Marcel Apfelbaum , "Michael S. Tsirkin" This should help catch property name typos at compile time. Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Signed-off-by: Laszlo Ersek --- Notes: v7: - new in v7 include/hw/pci/pci_bridge.h | 2 ++ hw/pci-bridge/pci_bridge_dev.c | 3 ++- hw/pci-bridge/pci_expander_bridge.c | 3 ++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h index 1d8f997..f3ac49f 100644 --- a/include/hw/pci/pci_bridge.h +++ b/include/hw/pci/pci_bridge.h @@ -28,6 +28,8 @@ #include "hw/pci/pci.h" +#define PCI_BRIDGE_DEV_PROP_CHASSIS_NR "chassis_nr" + int pci_bridge_ssvid_init(PCIDevice *dev, uint8_t offset, uint16_t svid, uint16_t ssid); diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c index d697c7b..f669ecd 100644 --- a/hw/pci-bridge/pci_bridge_dev.c +++ b/hw/pci-bridge/pci_bridge_dev.c @@ -122,7 +122,8 @@ static void qdev_pci_bridge_dev_reset(DeviceState *qdev) static Property pci_bridge_dev_properties[] = { /* Note: 0 is not a legal chassis number. */ - DEFINE_PROP_UINT8("chassis_nr", PCIBridgeDev, chassis_nr, 0), + DEFINE_PROP_UINT8(PCI_BRIDGE_DEV_PROP_CHASSIS_NR, PCIBridgeDev, chassis_nr, + 0), DEFINE_PROP_BIT("msi", PCIBridgeDev, flags, PCI_BRIDGE_DEV_F_MSI_REQ, true), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/pci-bridge/pci_expander_bridge.c b/hw/pci-bridge/pci_expander_bridge.c index ec2bb45..3d840ef 100644 --- a/hw/pci-bridge/pci_expander_bridge.c +++ b/hw/pci-bridge/pci_expander_bridge.c @@ -14,6 +14,7 @@ #include "hw/pci/pci_bus.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" +#include "hw/pci/pci_bridge.h" #include "hw/i386/pc.h" #include "qemu/range.h" #include "qemu/error-report.h" @@ -175,7 +176,7 @@ static int pxb_dev_initfn(PCIDevice *dev) bds = qdev_create(BUS(bus), "pci-bridge"); bds->id = dev_name; - qdev_prop_set_uint8(bds, "chassis_nr", pxb->bus_nr); + qdev_prop_set_uint8(bds, PCI_BRIDGE_DEV_PROP_CHASSIS_NR, pxb->bus_nr); PCI_HOST_BRIDGE(ds)->bus = bus; -- 1.8.3.1