From: Laszlo Ersek <lersek@redhat.com>
To: qemu-devel@nongnu.org, lersek@redhat.com
Cc: Marcel Apfelbaum <marcel@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH v7 03/10] hw/pci-bridge: add macro for "chassis_nr" property
Date: Fri, 19 Jun 2015 04:40:10 +0200 [thread overview]
Message-ID: <1434681617-15539-4-git-send-email-lersek@redhat.com> (raw)
In-Reply-To: <1434681617-15539-1-git-send-email-lersek@redhat.com>
This should help catch property name typos at compile time.
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---
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
next prev parent reply other threads:[~2015-06-19 2:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-19 2:40 [Qemu-devel] [PATCH v7 00/10] PXB changes Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 01/10] migration: introduce VMSTATE_BUFFER_UNSAFE_INFO_TEST() Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 02/10] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE() Laszlo Ersek
2015-06-19 2:40 ` Laszlo Ersek [this message]
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 04/10] hw/pci-bridge: add macro for "msi" property Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 05/10] hw/pci: introduce shpc_present() helper function Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 06/10] hw/pci-bridge: introduce "shpc" property Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 07/10] hw/pci-bridge: disable SHPC in PXB Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 08/10] hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf() Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 09/10] hw/core: explicit OFW unit address callback for SysBusDeviceClass Laszlo Ersek
2015-06-19 2:40 ` [Qemu-devel] [PATCH v7 10/10] hw/pci-bridge: format special OFW unit address for PXB host Laszlo Ersek
2015-06-24 5:40 ` Michael S. Tsirkin
2015-06-24 7:01 ` Laszlo Ersek
2015-06-24 7:08 ` Marcel Apfelbaum
2015-06-24 17:11 ` Kevin O'Connor
2015-06-24 17:14 ` Marcel Apfelbaum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434681617-15539-4-git-send-email-lersek@redhat.com \
--to=lersek@redhat.com \
--cc=marcel@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).