mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 03:43:37 +08:00
savevm: Remove all the unneeded version_minimum_id_old (usb)
After previous Peter patch, they are redundant. This way we don't assign 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 from aesthetics) was that checkpatch complained when we copy&pasted the code from one place to another. Signed-off-by: Juan Quintela <quintela@redhat.com> Acked-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
parent
14bcfdc7f1
commit
6e3d652ab2
@ -63,7 +63,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),
|
||||
|
@ -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()
|
||||
|
@ -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),
|
||||
|
@ -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),
|
||||
|
@ -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()
|
||||
|
@ -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()
|
||||
}
|
||||
|
@ -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),
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user