From patchwork Mon Apr 21 14:41:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 341132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7E1461400EF for ; Tue, 22 Apr 2014 13:21:11 +1000 (EST) Received: from localhost ([::1]:49565 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFxP-0001o7-BK for incoming@patchwork.ozlabs.org; Mon, 21 Apr 2014 11:16:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRg-0005nd-1B for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WcFRY-0004Jz-61 for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49424) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WcFRX-0004Jp-VB for qemu-devel@nongnu.org; Mon, 21 Apr 2014 10:43:36 -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 (8.14.4/8.14.4) with ESMTP id s3LEhZv6015826 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 21 Apr 2014 10:43:35 -0400 Received: from trasno.mitica (ovpn-116-41.ams2.redhat.com [10.36.116.41]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s3LEfi7Q019220; Mon, 21 Apr 2014 10:43:34 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Mon, 21 Apr 2014 16:41:00 +0200 Message-Id: <1398091304-10677-81-git-send-email-quintela@redhat.com> In-Reply-To: <1398091304-10677-1-git-send-email-quintela@redhat.com> References: <1398091304-10677-1-git-send-email-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 080/124] vmstate: Move all users of versioning to VMSTATE_STRUCT_TEST X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/usb/hcd-ehci-pci.c | 3 ++- hw/usb/hcd-ehci-sysbus.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c index 505741a..6ada623 100644 --- a/hw/usb/hcd-ehci-pci.c +++ b/hw/usb/hcd-ehci-pci.c @@ -110,7 +110,8 @@ static const VMStateDescription vmstate_ehci_pci = { .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(pcidev, EHCIPCIState), - VMSTATE_STRUCT(ehci, EHCIPCIState, 2, vmstate_ehci, EHCIState), + VMSTATE_STRUCT_TEST(ehci, EHCIPCIState, vmstate_2_plus, + vmstate_ehci, EHCIState), VMSTATE_END_OF_LIST() } }; diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c index 19ed2c2..2c28555 100644 --- a/hw/usb/hcd-ehci-sysbus.c +++ b/hw/usb/hcd-ehci-sysbus.c @@ -22,7 +22,8 @@ static const VMStateDescription vmstate_ehci_sysbus = { .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_STRUCT(ehci, EHCISysBusState, 2, vmstate_ehci, EHCIState), + VMSTATE_STRUCT_TEST(ehci, EHCISysBusState, vmstate_2_plus, + vmstate_ehci, EHCIState), VMSTATE_END_OF_LIST() } };