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/input | |
| 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/input')
| -rw-r--r-- | hw/input/ps2.c | 8 | ||||
| -rw-r--r-- | hw/input/tsc210x.c | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/hw/input/ps2.c b/hw/input/ps2.c index 77906d5f46..dff3f1e024 100644 --- a/hw/input/ps2.c +++ b/hw/input/ps2.c @@ -1216,12 +1216,14 @@ static int ps2_kbd_post_load(void* opaque, int version_id) return 0; } -static void ps2_kbd_pre_save(void *opaque) +static int ps2_kbd_pre_save(void *opaque) { PS2KbdState *s = (PS2KbdState *)opaque; PS2State *ps2 = &s->common; ps2_common_post_load(ps2); + + return 0; } static const VMStateDescription vmstate_ps2_keyboard = { @@ -1254,12 +1256,14 @@ static int ps2_mouse_post_load(void *opaque, int version_id) return 0; } -static void ps2_mouse_pre_save(void *opaque) +static int ps2_mouse_pre_save(void *opaque) { PS2MouseState *s = (PS2MouseState *)opaque; PS2State *ps2 = &s->common; ps2_common_post_load(ps2); + + return 0; } static const VMStateDescription vmstate_ps2_mouse = { diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c index b068343771..75ac8c2ab5 100644 --- a/hw/input/tsc210x.c +++ b/hw/input/tsc210x.c @@ -976,10 +976,12 @@ static void tsc210x_i2s_set_rate(TSC210xState *s, int in, int out) s->i2s_rx_rate = in; } -static void tsc210x_pre_save(void *opaque) +static int tsc210x_pre_save(void *opaque) { TSC210xState *s = (TSC210xState *) opaque; s->now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + + return 0; } static int tsc210x_post_load(void *opaque, int version_id) |