[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 02/10] hw/pci-bridge: expose _test parameter in S
From: |
Laszlo Ersek |
Subject: |
[Qemu-devel] [PATCH v7 02/10] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE() |
Date: |
Fri, 19 Jun 2015 04:40:09 +0200 |
Change the signature of the function-like macro SHPC_VMSTATE(), so that we
can produce and expect this field conditionally in the migration stream,
starting with an upcoming patch.
Cc: Michael S. Tsirkin <address@hidden>
Cc: Marcel Apfelbaum <address@hidden>
Signed-off-by: Laszlo Ersek <address@hidden>
---
Notes:
v7:
- no changes
v6:
- new in v6 (replaces "hw/pci-bridge: create interrupt-less,
hotplug-less bridge for PXB" from v5) [Michael]
include/hw/pci/shpc.h | 5 +++--
hw/pci-bridge/pci_bridge_dev.c | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/hw/pci/shpc.h b/include/hw/pci/shpc.h
index 9bbea39..14015af 100644
--- a/include/hw/pci/shpc.h
+++ b/include/hw/pci/shpc.h
@@ -51,7 +51,8 @@ void shpc_device_hot_unplug_request_cb(HotplugHandler
*hotplug_dev,
DeviceState *dev, Error **errp);
extern VMStateInfo shpc_vmstate_info;
-#define SHPC_VMSTATE(_field, _type) \
- VMSTATE_BUFFER_UNSAFE_INFO(_field, _type, 0, shpc_vmstate_info, 0)
+#define SHPC_VMSTATE(_field, _type, _test) \
+ VMSTATE_BUFFER_UNSAFE_INFO_TEST(_field, _type, _test, 0, \
+ shpc_vmstate_info, 0)
#endif
diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 36f73e1..d697c7b 100644
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -131,7 +131,7 @@ static const VMStateDescription pci_bridge_dev_vmstate = {
.name = "pci_bridge",
.fields = (VMStateField[]) {
VMSTATE_PCI_DEVICE(parent_obj, PCIBridge),
- SHPC_VMSTATE(shpc, PCIDevice),
+ SHPC_VMSTATE(shpc, PCIDevice, NULL),
VMSTATE_END_OF_LIST()
}
};
--
1.8.3.1
- [Qemu-devel] [PATCH v7 00/10] PXB changes, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 02/10] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE(),
Laszlo Ersek <=
- [Qemu-devel] [PATCH v7 01/10] migration: introduce VMSTATE_BUFFER_UNSAFE_INFO_TEST(), Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 03/10] hw/pci-bridge: add macro for "chassis_nr" property, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 05/10] hw/pci: introduce shpc_present() helper function, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 04/10] hw/pci-bridge: add macro for "msi" property, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 06/10] hw/pci-bridge: introduce "shpc" property, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 07/10] hw/pci-bridge: disable SHPC in PXB, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 08/10] hw/core: rebase sysbus_get_fw_dev_path() to g_strdup_printf(), Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 09/10] hw/core: explicit OFW unit address callback for SysBusDeviceClass, Laszlo Ersek, 2015/06/18
- [Qemu-devel] [PATCH v7 10/10] hw/pci-bridge: format special OFW unit address for PXB host, Laszlo Ersek, 2015/06/18