From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54749) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wjnyf-0003D6-Cn for qemu-devel@nongnu.org; Mon, 12 May 2014 07:01:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjnyZ-0005Nr-6q for qemu-devel@nongnu.org; Mon, 12 May 2014 07:01:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22727) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjnyY-0005Nn-Uc for qemu-devel@nongnu.org; Mon, 12 May 2014 07:00:55 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s4CB0nmt015833 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 12 May 2014 07:00:54 -0400 From: Juan Quintela In-Reply-To: <1398091304-10677-3-git-send-email-quintela@redhat.com> (Juan Quintela's message of "Mon, 21 Apr 2014 16:39:42 +0200") References: <1398091304-10677-1-git-send-email-quintela@redhat.com> <1398091304-10677-3-git-send-email-quintela@redhat.com> Date: Mon, 12 May 2014 13:00:27 +0200 Message-ID: <87d2fj5kj8.fsf@elfo.mitica> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH 002/124] savevm: Remove all the unneded version_minimum_id_old (usb) Reply-To: quintela@redhat.com List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Gerd Hoffmann Juan Quintela wrote: kraxel, could you ack this? And should this got it through my tree or yours? Thanks, Juan. > After previous Peter patch, they are redundant. This way we don't asign them > except when needed. Once there, there were lots of case where the ".fields" > indentation was wrong: > > .fields = (VMStateField []) { > and > .fields = (VMStateField []) { > > Change all the combinations to: > > .fields = (VMStateField[]){ > > The biggest problem (appart of aesthetics) was that checkpatch complained > when we copy&pasted the code from one place to another. > > Signed-off-by: Juan Quintela > --- > hw/usb/bus.c | 2 +- > hw/usb/dev-hid.c | 4 ++-- > hw/usb/dev-hub.c | 4 ++-- > hw/usb/dev-storage.c | 2 +- > hw/usb/hcd-ehci-pci.c | 2 +- > hw/usb/hcd-ehci-sysbus.c | 2 +- > hw/usb/hcd-ehci.c | 2 +- > hw/usb/hcd-uhci.c | 6 ++---- > 8 files changed, 11 insertions(+), 13 deletions(-) > > diff --git a/hw/usb/bus.c b/hw/usb/bus.c > index fe70429..5f201cb 100644 > --- a/hw/usb/bus.c > +++ b/hw/usb/bus.c > @@ -61,7 +61,7 @@ const VMStateDescription vmstate_usb_device = { > .version_id = 1, > .minimum_version_id = 1, > .post_load = usb_device_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT8(addr, USBDevice), > VMSTATE_INT32(state, USBDevice), > VMSTATE_INT32(remote_wakeup, USBDevice), > diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c > index f36e617..d097d93 100644 > --- a/hw/usb/dev-hid.c > +++ b/hw/usb/dev-hid.c > @@ -622,7 +622,7 @@ static const VMStateDescription vmstate_usb_ptr = { > .version_id = 1, > .minimum_version_id = 1, > .post_load = usb_ptr_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_USB_DEVICE(dev, USBHIDState), > VMSTATE_HID_POINTER_DEVICE(hid, USBHIDState), > VMSTATE_END_OF_LIST() > @@ -633,7 +633,7 @@ static const VMStateDescription vmstate_usb_kbd = { > .name = "usb-kbd", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_USB_DEVICE(dev, USBHIDState), > VMSTATE_HID_KEYBOARD_DEVICE(hid, USBHIDState), > VMSTATE_END_OF_LIST() > diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c > index bc03531..7492174 100644 > --- a/hw/usb/dev-hub.c > +++ b/hw/usb/dev-hub.c > @@ -540,7 +540,7 @@ static const VMStateDescription vmstate_usb_hub_port = { > .name = "usb-hub-port", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(wPortStatus, USBHubPort), > VMSTATE_UINT16(wPortChange, USBHubPort), > VMSTATE_END_OF_LIST() > @@ -551,7 +551,7 @@ static const VMStateDescription vmstate_usb_hub = { > .name = "usb-hub", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_USB_DEVICE(dev, USBHubState), > VMSTATE_STRUCT_ARRAY(ports, USBHubState, NUM_PORTS, 0, > vmstate_usb_hub_port, USBHubPort), > diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c > index 2852669..e919100 100644 > --- a/hw/usb/dev-storage.c > +++ b/hw/usb/dev-storage.c > @@ -716,7 +716,7 @@ static const VMStateDescription vmstate_usb_msd = { > .name = "usb-storage", > .version_id = 1, > .minimum_version_id = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_USB_DEVICE(dev, MSDState), > VMSTATE_UINT32(mode, MSDState), > VMSTATE_UINT32(scsi_len, MSDState), > diff --git a/hw/usb/hcd-ehci-pci.c b/hw/usb/hcd-ehci-pci.c > index 484a9bd..505741a 100644 > --- a/hw/usb/hcd-ehci-pci.c > +++ b/hw/usb/hcd-ehci-pci.c > @@ -108,7 +108,7 @@ static const VMStateDescription vmstate_ehci_pci = { > .name = "ehci", > .version_id = 2, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(pcidev, EHCIPCIState), > VMSTATE_STRUCT(ehci, EHCIPCIState, 2, vmstate_ehci, EHCIState), > VMSTATE_END_OF_LIST() > diff --git a/hw/usb/hcd-ehci-sysbus.c b/hw/usb/hcd-ehci-sysbus.c > index fe6eea5..19ed2c2 100644 > --- a/hw/usb/hcd-ehci-sysbus.c > +++ b/hw/usb/hcd-ehci-sysbus.c > @@ -21,7 +21,7 @@ static const VMStateDescription vmstate_ehci_sysbus = { > .name = "ehci-sysbus", > .version_id = 2, > .minimum_version_id = 1, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > VMSTATE_STRUCT(ehci, EHCISysBusState, 2, vmstate_ehci, EHCIState), > VMSTATE_END_OF_LIST() > } > diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c > index 355bbd6..a3ae9f2 100644 > --- a/hw/usb/hcd-ehci.c > +++ b/hw/usb/hcd-ehci.c > @@ -2492,7 +2492,7 @@ const VMStateDescription vmstate_ehci = { > .minimum_version_id = 1, > .pre_save = usb_ehci_pre_save, > .post_load = usb_ehci_post_load, > - .fields = (VMStateField[]) { > + .fields = (VMStateField[]) { > /* mmio registers */ > VMSTATE_UINT32(usbcmd, EHCIState), > VMSTATE_UINT32(usbsts, EHCIState), > diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c > index 0820244..9b1166b 100644 > --- a/hw/usb/hcd-uhci.c > +++ b/hw/usb/hcd-uhci.c > @@ -422,8 +422,7 @@ static const VMStateDescription vmstate_uhci_port = { > .name = "uhci port", > .version_id = 1, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_UINT16(ctrl, UHCIPort), > VMSTATE_END_OF_LIST() > } > @@ -444,9 +443,8 @@ static const VMStateDescription vmstate_uhci = { > .name = "uhci", > .version_id = 3, > .minimum_version_id = 1, > - .minimum_version_id_old = 1, > .post_load = uhci_post_load, > - .fields = (VMStateField []) { > + .fields = (VMStateField[]) { > VMSTATE_PCI_DEVICE(dev, UHCIState), > VMSTATE_UINT8_EQUAL(num_ports_vmstate, UHCIState), > VMSTATE_STRUCT_ARRAY(ports, UHCIState, NB_PORTS, 1,