diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-06-24 15:33:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-06-24 15:33:42 +0100 |
| commit | 513d80edc15d77b6d85df7dfad750ce95d091b78 (patch) | |
| tree | c0371bf5c7685bfc7d44b6c9835413f86a26211a /hw | |
| parent | 089a39486f2c47994c6c0d34ac7abf34baf40d9d (diff) | |
| parent | 4ea7df4e5c6b9d8b8a474680d6b1687fc8eacbac (diff) | |
| download | qemu-513d80edc15d77b6d85df7dfad750ce95d091b78.zip qemu-513d80edc15d77b6d85df7dfad750ce95d091b78.tar.gz qemu-513d80edc15d77b6d85df7dfad750ce95d091b78.tar.bz2 | |
Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140623' into staging
migration/next for 20140623
# gpg: Signature made Mon 23 Jun 2014 18:18:57 BST using RSA key ID 5872D723
# gpg: Can't check signature: public key not found
* remotes/juanquintela/tags/migration/20140623: (22 commits)
vmstate: Refactor & increase tests for primitive types
vmstate: Return error in case of error
migration: Remove unneeded minimum_version_id_old
tests: vmstate static checker: add size mismatch inside substructure
tests: vmstate static checker: add substructure for usb-kbd for hid section
tests: vmstate static checker: remove Subsections
tests: vmstate static checker: remove a subsection
tests: vmstate static checker: remove Description inside Fields
tests: vmstate static checker: remove Description
tests: vmstate static checker: remove Fields
tests: vmstate static checker: change description name
tests: vmstate static checker: remove last field in a struct
tests: vmstate static checker: remove a field
tests: vmstate static checker: remove a section
tests: vmstate static checker: minimum_version_id check
tests: vmstate static checker: version mismatch inside a Description
tests: vmstate static checker: add version error in main section
tests: vmstate static checker: incompat machine types
tests: vmstate static checker: add dump1 and dump2 files
vmstate-static-checker: script to validate vmstate changes
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/usb/hcd-ohci.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index cd87074..cace945 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -1988,8 +1988,7 @@ static const VMStateDescription vmstate_ohci_state_port = { .name = "ohci-core/port", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_UINT32(ctrl, OHCIPort), VMSTATE_END_OF_LIST() }, @@ -2015,9 +2014,8 @@ static const VMStateDescription vmstate_ohci_eof_timer = { .name = "ohci-core/eof-timer", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .pre_load = ohci_eof_timer_pre_load, - .fields = (VMStateField []) { + .fields = (VMStateField[]) { VMSTATE_TIMER(eof_timer, OHCIState), VMSTATE_END_OF_LIST() }, @@ -2078,7 +2076,6 @@ static const VMStateDescription vmstate_ohci = { .name = "ohci", .version_id = 1, .minimum_version_id = 1, - .minimum_version_id_old = 1, .fields = (VMStateField[]) { VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState), VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState), |