From 960f8fa5e2edbfa0b469cbd7ac38e8a341851bd5 Mon Sep 17 00:00:00 2001 From: Laszlo Ersek Date: Mon, 13 Jul 2015 19:17:42 +0200 Subject: [PATCH 16/23] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE() Message-id: <1436815069-15106-6-git-send-email-lersek@redhat.com> Patchwork-id: 66996 O-Subject: [RHEV-7.2 qemu-kvm-rhev PATCH 05/12] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE() Bugzilla: 1242479 RH-Acked-by: Marcel Apfelbaum RH-Acked-by: Paolo Bonzini RH-Acked-by: Michael S. Tsirkin 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 Cc: Marcel Apfelbaum Signed-off-by: Laszlo Ersek Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin (cherry picked from commit 0034e56209c1333bfca53356ce82663d801a15c5) Signed-off-by: Miroslav Rezanina --- hw/pci-bridge/pci_bridge_dev.c | 2 +- include/hw/pci/shpc.h | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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() } }; 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 -- 1.8.3.1