From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55374) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5CiY-0001uJ-KJ for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:45:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5CiT-0000Ax-Oc for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:45:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5CiT-0000Ap-K1 for qemu-devel@nongnu.org; Wed, 17 Jun 2015 08:45:17 -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 3B7F53663B0 for ; Wed, 17 Jun 2015 12:45:17 +0000 (UTC) From: Laszlo Ersek Date: Wed, 17 Jun 2015 14:45:00 +0200 Message-Id: <1434545105-5811-3-git-send-email-lersek@redhat.com> In-Reply-To: <1434545105-5811-1-git-send-email-lersek@redhat.com> References: <1434545105-5811-1-git-send-email-lersek@redhat.com> Subject: [Qemu-devel] [PATCH v6 2/7] hw/pci-bridge: expose _test parameter in SHPC_VMSTATE() 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" 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 the next patch. Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Signed-off-by: Laszlo Ersek --- Notes: 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