diff options
| author | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-25 12:29:12 +0100 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2017-09-27 11:35:59 +0100 |
| commit | 44b1ff319c4781c7ab13f7e119b3114a1e6a52e2 (patch) | |
| tree | b8e8aa9c74c890808876e7a5969b69ac25c1930a /hw/timer/pl031.c | |
| parent | 9ac78b6171bec47083a9b6ce88dc1f114caea2f9 (diff) | |
migration: pre_save return int
Modify the pre_save method on VMStateDescription to return an int
rather than void so that it potentially can fail.
Changed zillions of devices to make them return 0; the only
case I've made it return non-0 is hw/intc/s390_flic_kvm.c that already
had an error_report/return case.
Note: If you add an error exit in your pre_save you must emit
an error_report to say why.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20170925112917.21340-2-dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'hw/timer/pl031.c')
| -rw-r--r-- | hw/timer/pl031.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/timer/pl031.c b/hw/timer/pl031.c index dbbeb9b16b..d3aacce80d 100644 --- a/hw/timer/pl031.c +++ b/hw/timer/pl031.c @@ -211,7 +211,7 @@ static void pl031_init(Object *obj) s->timer = timer_new_ns(rtc_clock, pl031_interrupt, s); } -static void pl031_pre_save(void *opaque) +static int pl031_pre_save(void *opaque) { PL031State *s = opaque; @@ -219,6 +219,8 @@ static void pl031_pre_save(void *opaque) * store the base time relative to the QEMU_CLOCK_VIRTUAL for backwards-compatibility. */ int64_t delta = qemu_clock_get_ns(rtc_clock) - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); s->tick_offset_vmstate = s->tick_offset + delta / NANOSECONDS_PER_SECOND; + + return 0; } static int pl031_post_load(void *opaque, int version_id) |