diff options
| author | Peter Maydell | 2017-09-27 23:44:51 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-27 23:44:51 +0200 |
| commit | ab161529261928ae7f3556e3220829c34b2686ec (patch) | |
| tree | a19806665ba984fec11c0d1175cc39d0d3a4edd8 /hw/timer/twl92230.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20170927' int... (diff) | |
| parent | migration: Route more error paths (diff) | |
| download | qemu-ab161529261928ae7f3556e3220829c34b2686ec.tar.gz qemu-ab161529261928ae7f3556e3220829c34b2686ec.tar.xz qemu-ab161529261928ae7f3556e3220829c34b2686ec.zip | |
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/timer/twl92230.c')
| -rw-r--r-- | hw/timer/twl92230.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/timer/twl92230.c b/hw/timer/twl92230.c index c0aa8ae3de..eb58c378e0 100644 --- a/hw/timer/twl92230.c +++ b/hw/timer/twl92230.c @@ -791,11 +791,13 @@ static const VMStateDescription vmstate_menelaus_tm = { } }; -static void menelaus_pre_save(void *opaque) +static int menelaus_pre_save(void *opaque) { MenelausState *s = opaque; /* Should be <= 1000 */ s->rtc_next_vmstate = s->rtc.next - qemu_clock_get_ms(rtc_clock); + + return 0; } static int menelaus_post_load(void *opaque, int version_id) |