From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40770) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bydNm-0002bi-CJ for qemu-devel@nongnu.org; Mon, 24 Oct 2016 07:25:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bydNh-0006Kb-E3 for qemu-devel@nongnu.org; Mon, 24 Oct 2016 07:25:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bydNh-0006KV-5u for qemu-devel@nongnu.org; Mon, 24 Oct 2016 07:25:29 -0400 Date: Mon, 24 Oct 2016 12:25:23 +0100 From: "Dr. David Alan Gilbert" Message-ID: <20161024112523.GB4014@work-vm> References: <20161021143741.8597-1-pasic@linux.vnet.ibm.com> <20161021143741.8597-2-pasic@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161021143741.8597-2-pasic@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH 1/4] tests/test-vmstate.c: add save_buffer util func List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Halil Pasic Cc: qemu-devel@nongnu.org, Amit Shah , Juan Quintela , Guenther Hutzl * Halil Pasic (pasic@linux.vnet.ibm.com) wrote: > 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 > Reviewed-by: Guenther Hutzl Reviewed-by: Dr. David Alan Gilbert > --- > tests/test-vmstate.c | 23 +++++++++++------------ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index d8da26f..d513dc6 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -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); > @@ -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 }; > @@ -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 */ > @@ -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; > @@ -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 */ > @@ -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 }; > @@ -451,7 +452,6 @@ 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 */ > @@ -459,8 +459,7 @@ static void test_load_skip(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 = true, .c = 300, .e = 500 }; > -- > 2.8.4 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK