[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] Revert "tests/test-vmstate.c: prove VMStateFiel
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH 3/4] Revert "tests/test-vmstate.c: prove VMStateField.start broken" |
Date: |
Tue, 18 Oct 2016 12:57:23 +0200 |
This reverts the effect of the previous patch in the series as
a preparation for getting rid of VMStateField.start.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Guenther Hutzl <address@hidden>
---
tests/test-vmstate.c | 48 ------------------------------------------------
1 file changed, 48 deletions(-)
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c
index a2ef4a8..4ea64b7 100644
--- a/tests/test-vmstate.c
+++ b/tests/test-vmstate.c
@@ -588,53 +588,6 @@ static void test_complex_vbuffer(void)
#undef FIELD_EQUAL
#undef BUFFER_EQUAL
-typedef struct {
- uint32_t vbuff_size;
- uint8_t *vbuff;
- uint64_t stuff;
-} TestVBufStart;
-
-static const VMStateDescription vmstate_vbuff_alloc_start = {
- .name = "test/vbuff_alloc_start",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (VMStateField[]) {
- VMSTATE_UINT64(stuff, TestVBufStart),
- VMSTATE_UINT32(vbuff_size, TestVBufStart),
- VMSTATE_VBUFFER_ALLOC_UINT32(vbuff, TestVBufStart, 1, 0, 1,
vbuff_size),
- VMSTATE_END_OF_LIST()
- }
-
-};
-
-static void load_vmstate_one_obj(const VMStateDescription *vmsd, void *obj,
- int version_id)
-{
- QEMUFile *fload = open_test_file(false);
-
- SUCCESS(vmstate_load_state(fload, vmsd, obj, version_id));
- qemu_fclose(fload);
-}
-
-static void test_vbuff_alloc_start(void)
-{
- uint8_t my_vbuff1[] = {0, 1, 2, 3};
- uint8_t my_vbuff2[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
- TestVBufStart sample = {
- .stuff = 1,
- .vbuff_size = 3,
- .vbuff = my_vbuff1,
- };
- TestVBufStart load_obj = {
- .vbuff = my_vbuff2,
- };
-
- save_vmstate(&vmstate_vbuff_alloc_start, &sample);
- load_vmstate_one_obj(&vmstate_vbuff_alloc_start, &load_obj, 1);
- g_assert_cmpint(load_obj.stuff, ==, 0);
- g_assert_cmpint((uint64_t) load_obj.vbuff, !=, (uint64_t) my_vbuff2);
-}
-
int main(int argc, char **argv)
{
temp_fd = mkstemp(temp_file);
@@ -650,7 +603,6 @@ int main(int argc, char **argv)
g_test_add_func("/vmstate/field_exists/save/noskip", test_save_noskip);
g_test_add_func("/vmstate/field_exists/save/skip", test_save_skip);
g_test_add_func("/vmstate/complex/vbuffer", test_complex_vbuffer);
- g_test_add_func("/vmstate/vbuff/alloc_start", test_vbuff_alloc_start);
g_test_run();
close(temp_fd);
unlink(temp_file);
--
2.8.4
- [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, (continued)
- [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Halil Pasic, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Dr. David Alan Gilbert, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Halil Pasic, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Dr. David Alan Gilbert, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Halil Pasic, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Dr. David Alan Gilbert, 2016/10/18
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Halil Pasic, 2016/10/19
- Re: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken, Dr. David Alan Gilbert, 2016/10/20
[Qemu-devel] [PATCH 4/4] migration: drop unused VMStateField.start, Halil Pasic, 2016/10/18
[Qemu-devel] [PATCH 3/4] Revert "tests/test-vmstate.c: prove VMStateField.start broken",
Halil Pasic <=
Re: [Qemu-devel] [PATCH 0/4] remove unused VMSTateField.start, no-reply, 2016/10/18