Skip to content

Commit

Permalink
tests/test-vmstate.c: add save_buffer util func
Browse files Browse the repository at this point in the history
Let us de-duplicate some code by introducing an utility function for
saving a chunk of bytes (used when testing load based on wire).

Signed-off-by: Halil Pasic <pasic@linux.vnet.ibm.com>
Reviewed-by: Guenther Hutzl <hutzl@linux.vnet.ibm.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
  • Loading branch information
Halil Pasic authored and Juan Quintela committed Nov 14, 2016
1 parent fe39a4d commit 6d57b4c
Showing 1 changed file with 11 additions and 12 deletions.
23 changes: 11 additions & 12 deletions tests/test-vmstate.c
Expand Up @@ -83,6 +83,13 @@ static void save_vmstate(const VMStateDescription *desc, void *obj)
qemu_fclose(f);
}

static void save_buffer(const uint8_t *buf, size_t buf_size)
{
QEMUFile *fsave = open_test_file(true);
qemu_put_buffer(fsave, buf, buf_size);
qemu_fclose(fsave);
}

static void compare_vmstate(uint8_t *wire, size_t size)
{
QEMUFile *f = open_test_file(false);
Expand Down Expand Up @@ -309,15 +316,13 @@ static const VMStateDescription vmstate_versioned = {

static void test_load_v1(void)
{
QEMUFile *fsave = open_test_file(true);
uint8_t buf[] = {
0, 0, 0, 10, /* a */
0, 0, 0, 30, /* c */
0, 0, 0, 0, 0, 0, 0, 40, /* d */
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
qemu_put_buffer(fsave, buf, sizeof(buf));
qemu_fclose(fsave);
save_buffer(buf, sizeof(buf));

QEMUFile *loading = open_test_file(false);
TestStruct obj = { .b = 200, .e = 500, .f = 600 };
Expand All @@ -334,7 +339,6 @@ static void test_load_v1(void)

static void test_load_v2(void)
{
QEMUFile *fsave = open_test_file(true);
uint8_t buf[] = {
0, 0, 0, 10, /* a */
0, 0, 0, 20, /* b */
Expand All @@ -344,8 +348,7 @@ static void test_load_v2(void)
0, 0, 0, 0, 0, 0, 0, 60, /* f */
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
qemu_put_buffer(fsave, buf, sizeof(buf));
qemu_fclose(fsave);
save_buffer(buf, sizeof(buf));

QEMUFile *loading = open_test_file(false);
TestStruct obj;
Expand Down Expand Up @@ -423,7 +426,6 @@ static void test_save_skip(void)

static void test_load_noskip(void)
{
QEMUFile *fsave = open_test_file(true);
uint8_t buf[] = {
0, 0, 0, 10, /* a */
0, 0, 0, 20, /* b */
Expand All @@ -433,8 +435,7 @@ static void test_load_noskip(void)
0, 0, 0, 0, 0, 0, 0, 60, /* f */
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
qemu_put_buffer(fsave, buf, sizeof(buf));
qemu_fclose(fsave);
save_buffer(buf, sizeof(buf));

QEMUFile *loading = open_test_file(false);
TestStruct obj = { .skip_c_e = false };
Expand All @@ -451,16 +452,14 @@ static void test_load_noskip(void)

static void test_load_skip(void)
{
QEMUFile *fsave = open_test_file(true);
uint8_t buf[] = {
0, 0, 0, 10, /* a */
0, 0, 0, 20, /* b */
0, 0, 0, 0, 0, 0, 0, 40, /* d */
0, 0, 0, 0, 0, 0, 0, 60, /* f */
QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */
};
qemu_put_buffer(fsave, buf, sizeof(buf));
qemu_fclose(fsave);
save_buffer(buf, sizeof(buf));

QEMUFile *loading = open_test_file(false);
TestStruct obj = { .skip_c_e = true, .c = 300, .e = 500 };
Expand Down

0 comments on commit 6d57b4c

Please sign in to comment.