diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-09-27 22:44:51 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-09-27 22:44:51 +0100 |
| commit | ab161529261928ae7f3556e3220829c34b2686ec (patch) | |
| tree | a19806665ba984fec11c0d1175cc39d0d3a4edd8 /hw/usb | |
| parent | 1d8934408135ac03b1c753c3b0a819cf7f387d60 (diff) | |
| parent | 2f168d0708581c33baf6c78d75a89e8cd705f9f6 (diff) | |
Merge remote-tracking branch 'remotes/dgilbert/tags/pull-migration-20170927a' into staging
Migration pull 2017-09-27
# gpg: Signature made Wed 27 Sep 2017 14:56:23 BST
# gpg: using RSA key 0x0516331EBC5BFDE7
# gpg: Good signature from "Dr. David Alan Gilbert (RH2) <dgilbert@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 45F5 C71B 4A0C B7FB 977A 9FA9 0516 331E BC5B FDE7
* remotes/dgilbert/tags/pull-migration-20170927a:
migration: Route more error paths
migration: Route errors up through vmstate_save
migration: wire vmstate_save_state errors up to vmstate_subsection_save
migration: Check field save returns
migration: check pre_save return in vmstate_save_state
migration: pre_save return int
migration: disable auto-converge during bulk block migration
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb')
| -rw-r--r-- | hw/usb/dev-smartcard-reader.c | 4 | ||||
| -rw-r--r-- | hw/usb/hcd-ehci.c | 4 | ||||
| -rw-r--r-- | hw/usb/redirect.c | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c index bef1f03c42..0c77d2a41d 100644 --- a/hw/usb/dev-smartcard-reader.c +++ b/hw/usb/dev-smartcard-reader.c @@ -1374,7 +1374,7 @@ static int ccid_post_load(void *opaque, int version_id) return 0; } -static void ccid_pre_save(void *opaque) +static int ccid_pre_save(void *opaque) { USBCCIDState *s = opaque; @@ -1386,6 +1386,8 @@ static void ccid_pre_save(void *opaque) */ s->migration_state = MIGRATION_MIGRATED; } + + return 0; } static VMStateDescription bulk_in_vmstate = { diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 46fd30b075..0134232627 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -2381,7 +2381,7 @@ static USBBusOps ehci_bus_ops_standalone = { .wakeup_endpoint = ehci_wakeup_endpoint, }; -static void usb_ehci_pre_save(void *opaque) +static int usb_ehci_pre_save(void *opaque) { EHCIState *ehci = opaque; uint32_t new_frindex; @@ -2390,6 +2390,8 @@ static void usb_ehci_pre_save(void *opaque) new_frindex = ehci->frindex & ~7; ehci->last_run_ns -= (ehci->frindex - new_frindex) * UFRAME_TIMER_NS; ehci->frindex = new_frindex; + + return 0; } static int usb_ehci_post_load(void *opaque, int version_id) diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c index 5e42730449..ec174309db 100644 --- a/hw/usb/redirect.c +++ b/hw/usb/redirect.c @@ -2111,11 +2111,13 @@ static void usbredir_buffered_bulk_packet(void *priv, uint64_t id, * Migration code */ -static void usbredir_pre_save(void *priv) +static int usbredir_pre_save(void *priv) { USBRedirDevice *dev = priv; usbredir_fill_already_in_flight(dev); + + return 0; } static int usbredir_post_load(void *priv, int version_id) |