From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3FzC-0003y4-Ic for qemu-devel@nongnu.org; Sat, 27 Jul 2013 21:41:33 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3Fz4-0003G0-VK for qemu-devel@nongnu.org; Sat, 27 Jul 2013 21:41:26 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49444 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3Fz4-0003Fa-LT for qemu-devel@nongnu.org; Sat, 27 Jul 2013 21:41:18 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 28 Jul 2013 03:41:08 +0200 Message-Id: <1374975670-8820-2-git-send-email-afaerber@suse.de> In-Reply-To: <1374975670-8820-1-git-send-email-afaerber@suse.de> References: <1374975670-8820-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH RFC for-1.6 qom-next 1/3] pcie: Move AER log into VMSTATE_PCIE_DEVICE() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Gerd Hoffmann , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Juan Quintela VMSTATE_PCIE_DEVICE() currently has the following users: * ioh3420 * xio3130-downstream * x3130-upstream * nec-usb-xhci All except for XHCI have VMSTATE_STRUCT(....exp.aer_log, ...) following VMSTATE_PCIE_DEVICE(), and XHCI was marked unmigratable in v1.5.0. Therefore move this recurring PCIe-only field into vmstate_pcie_device while we still can without breaking migration compatibility. Cc: Juan Quintela Cc: Gerd Hoffmann Signed-off-by: Andreas F=C3=A4rber --- hw/pci-bridge/ioh3420.c | 2 -- hw/pci-bridge/xio3130_downstream.c | 2 -- hw/pci-bridge/xio3130_upstream.c | 2 -- hw/pci/pci.c | 2 ++ 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index e07c7e8..296ed9f 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -188,8 +188,6 @@ static const VMStateDescription vmstate_ioh3420 =3D { .post_load =3D pcie_cap_slot_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), - VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, - PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), VMSTATE_END_OF_LIST() } }; diff --git a/hw/pci-bridge/xio3130_downstream.c b/hw/pci-bridge/xio3130_d= ownstream.c index 2c84b1a..f58717f 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -155,8 +155,6 @@ static const VMStateDescription vmstate_xio3130_downs= tream =3D { .post_load =3D pcie_cap_slot_post_load, .fields =3D (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), - VMSTATE_STRUCT(parent_obj.parent_obj.parent_obj.exp.aer_log, - PCIESlot, 0, vmstate_pcie_aer_log, PCIEAERLog), VMSTATE_END_OF_LIST() } }; diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_ups= tream.c index 82add15..fd78966 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -134,8 +134,6 @@ static const VMStateDescription vmstate_xio3130_upstr= eam =3D { .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), - VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, - vmstate_pcie_aer_log, PCIEAERLog), VMSTATE_END_OF_LIST() } }; diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 4c004f5..51ec4f7 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -490,6 +490,8 @@ const VMStateDescription vmstate_pcie_device =3D { VMSTATE_BUFFER_UNSAFE_INFO(irq_state, PCIDevice, 2, vmstate_info_pci_irq_state, PCI_NUM_PINS * sizeof(int32_t)), + VMSTATE_STRUCT(exp.aer_log, PCIDevice, 0, + vmstate_pcie_aer_log, PCIEAERLog), VMSTATE_END_OF_LIST() } }; --=20 1.8.1.4