From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3bIy-0002ba-RW for qemu-devel@nongnu.org; Sun, 28 Jul 2013 20:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3bIr-0003DL-EB for qemu-devel@nongnu.org; Sun, 28 Jul 2013 20:27:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44754 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3bIr-0003Cu-5F for qemu-devel@nongnu.org; Sun, 28 Jul 2013 20:27:09 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 29 Jul 2013 02:26:57 +0200 Message-Id: <1375057621-19961-3-git-send-email-afaerber@suse.de> In-Reply-To: <1375057621-19961-1-git-send-email-afaerber@suse.de> References: <1375057621-19961-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 qom-next for-next v2 2/6] pci: Simplify VMSTATE_PCIE_DEVICE() macro List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Michael S. Tsirkin" Drop the arguments to avoid QOM refactorings causing more churn. 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/usb/hcd-xhci.c | 2 +- include/hw/pci/pcie.h | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c index e07c7e8..0657354 100644 --- a/hw/pci-bridge/ioh3420.c +++ b/hw/pci-bridge/ioh3420.c @@ -187,7 +187,7 @@ static const VMStateDescription vmstate_ioh3420 =3D { .minimum_version_id_old =3D 1, .post_load =3D pcie_cap_slot_post_load, .fields =3D (VMStateField[]) { - VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), + VMSTATE_PCIE_DEVICE(), 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..9022949 100644 --- a/hw/pci-bridge/xio3130_downstream.c +++ b/hw/pci-bridge/xio3130_downstream.c @@ -154,7 +154,7 @@ static const VMStateDescription vmstate_xio3130_downs= tream =3D { .minimum_version_id_old =3D 1, .post_load =3D pcie_cap_slot_post_load, .fields =3D (VMStateField[]) { - VMSTATE_PCIE_DEVICE(parent_obj.parent_obj.parent_obj, PCIESlot), + VMSTATE_PCIE_DEVICE(), 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..046b790 100644 --- a/hw/pci-bridge/xio3130_upstream.c +++ b/hw/pci-bridge/xio3130_upstream.c @@ -133,7 +133,7 @@ static const VMStateDescription vmstate_xio3130_upstr= eam =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_PCIE_DEVICE(parent_obj.parent_obj, PCIEPort), + VMSTATE_PCIE_DEVICE(), VMSTATE_STRUCT(parent_obj.parent_obj.exp.aer_log, PCIEPort, 0, vmstate_pcie_aer_log, PCIEAERLog), VMSTATE_END_OF_LIST() diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 9ba3e3e..a22861f 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3544,7 +3544,7 @@ static const VMStateDescription vmstate_xhci =3D { .version_id =3D 1, .post_load =3D usb_xhci_post_load, .fields =3D (VMStateField[]) { - VMSTATE_PCIE_DEVICE(parent_obj, XHCIState), + VMSTATE_PCIE_DEVICE(), VMSTATE_MSIX(parent_obj, XHCIState), =20 VMSTATE_STRUCT_VARRAY_UINT32(ports, XHCIState, numports, 1, diff --git a/include/hw/pci/pcie.h b/include/hw/pci/pcie.h index c010007..fc4ebd3 100644 --- a/include/hw/pci/pcie.h +++ b/include/hw/pci/pcie.h @@ -132,12 +132,12 @@ void pcie_ari_init(PCIDevice *dev, uint16_t offset,= uint16_t nextfn); =20 extern const VMStateDescription vmstate_pcie_device; =20 -#define VMSTATE_PCIE_DEVICE(_field, _state) { \ - .name =3D (stringify(_field)), \ +#define VMSTATE_PCIE_DEVICE() { \ + .name =3D "parent_obj", \ .size =3D sizeof(PCIDevice), \ .vmsd =3D &vmstate_pcie_device, \ .flags =3D VMS_STRUCT, \ - .offset =3D vmstate_offset_value(_state, _field, PCIDevice), \ + .offset =3D 0, \ } =20 #endif /* QEMU_PCIE_H */ --=20 1.8.1.4