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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/test-vmstate.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index ee292c7bee..087844b6c8 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -70,7 +70,8 @@ static void save_vmstate(const VMStateDescription *desc, void *obj) QEMUFile *f = open_test_file(true); /* Save file with vmstate */ - vmstate_save_state(f, desc, obj, NULL); + int ret = vmstate_save_state(f, desc, obj, NULL); + g_assert(!ret); qemu_put_byte(f, QEMU_VM_EOF); g_assert(!qemu_file_get_error(f)); qemu_fclose(f); @@ -381,7 +382,8 @@ static void test_save_noskip(void) QEMUFile *fsave = open_test_file(true); TestStruct obj = { .a = 1, .b = 2, .c = 3, .d = 4, .e = 5, .f = 6, .skip_c_e = false }; - vmstate_save_state(fsave, &vmstate_skipping, &obj, NULL); + int ret = vmstate_save_state(fsave, &vmstate_skipping, &obj, NULL); + g_assert(!ret); g_assert(!qemu_file_get_error(fsave)); uint8_t expected[] = { @@ -402,7 +404,8 @@ static void test_save_skip(void) QEMUFile *fsave = open_test_file(true); TestStruct obj = { .a = 1, .b = 2, .c = 3, .d = 4, .e = 5, .f = 6, .skip_c_e = true }; - vmstate_save_state(fsave, &vmstate_skipping, &obj, NULL); + int ret = vmstate_save_state(fsave, &vmstate_skipping, &obj, NULL); + g_assert(!ret); g_assert(!qemu_file_get_error(fsave)); uint8_t expected[] = { @@ -765,11 +768,13 @@ typedef struct TmpTestStruct { int64_t diff; } TmpTestStruct; -static void tmp_child_pre_save(void *opaque) +static int tmp_child_pre_save(void *opaque) { struct TmpTestStruct *tts = opaque; tts->diff = tts->parent->b - tts->parent->a; + + return 0; } static int tmp_child_post_load(void *opaque, int version_id) |