From 44b1ff319c4781c7ab13f7e119b3114a1e6a52e2 Mon Sep 17 00:00:00 2001 From: "Dr. David Alan Gilbert" Date: Mon, 25 Sep 2017 12:29:12 +0100 Subject: 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 Message-Id: <20170925112917.21340-2-dgilbert@redhat.com> Reviewed-by: Peter Xu Reviewed-by: Cornelia Huck Reviewed-by: Juan Quintela Signed-off-by: Dr. David Alan Gilbert --- hw/i2c/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'hw/i2c') diff --git a/hw/i2c/core.c b/hw/i2c/core.c index 2c1234cdff..59068f157e 100644 --- a/hw/i2c/core.c +++ b/hw/i2c/core.c @@ -41,7 +41,7 @@ static const TypeInfo i2c_bus_info = { .instance_size = sizeof(I2CBus), }; -static void i2c_bus_pre_save(void *opaque) +static int i2c_bus_pre_save(void *opaque) { I2CBus *bus = opaque; @@ -53,6 +53,8 @@ static void i2c_bus_pre_save(void *opaque) bus->saved_address = I2C_BROADCAST; } } + + return 0; } static const VMStateDescription vmstate_i2c_bus = { -- cgit v1.2.3