From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:60437)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TRMF2-0000v4-4V
	for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:08:52 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TRMEu-0005yK-Gh
	for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:08:52 -0400
Received: from mx1.redhat.com ([209.132.183.28]:3010)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kraxel@redhat.com>) id 1TRMEu-0005yD-8Y
	for qemu-devel@nongnu.org; Thu, 25 Oct 2012 08:08:44 -0400
Message-ID: <50892BC7.6080400@redhat.com>
Date: Thu, 25 Oct 2012 14:08:39 +0200
From: Gerd Hoffmann <kraxel@redhat.com>
MIME-Version: 1.0
References: <cover.1351157627.git.peter.crosthwaite@xilinx.com>
	<6a52b259a18cf580984ab4263322b60a4c4877a0.1351157627.git.peter.crosthwaite@xilinx.com>
In-Reply-To: <6a52b259a18cf580984ab4263322b60a4c4877a0.1351157627.git.peter.crosthwaite@xilinx.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH v1 3/8] usb/ehci: seperate out PCIisms
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: vineshp@xilinx.com, edgar.iglesias@gmail.com, john.williams@xilinx.com, qemu-devel@nongnu.org, peter.maydell@linaro.org

> +typedef struct EHCIItfState {
> +    PCIDevice pcidev;
> +    struct EHCIState ehci;
> +} EHCIItfState;

EHCIPCIState ?

>  static const VMStateDescription vmstate_ehci = {
>      .name        = "ehci",
> -    .version_id  = 2,
> -    .minimum_version_id  = 1,
> +    .version_id  = 3,
> +    .minimum_version_id  = 2,

Pick a new name for this ...

> -static void ehci_class_init(ObjectClass *klass, void *data)
> +static const VMStateDescription vmstate_ehci_pci = {
> +    .name        = "ehci-pci",

... and keep using "ehci" here ...

> +    .version_id  = 3,
> +    .minimum_version_id  = 2,

... then you don't need to fiddle with the versions as the vmstate wire
format doesn't change then.

cheers,
  Gerd