From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53898) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0sJm-0001za-Tn for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:37:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y0sJh-0004Wi-3b for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:37:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y0sJg-0004We-T9 for qemu-devel@nongnu.org; Tue, 16 Dec 2014 08:37:33 -0500 Date: Tue, 16 Dec 2014 13:37:25 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20141216133724.GF5467@work-vm> References: <1418378027-19830-1-git-send-email-yanghy@cn.fujitsu.com> <1418378027-19830-2-git-send-email-yanghy@cn.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1418378027-19830-2-git-send-email-yanghy@cn.fujitsu.com> Subject: Re: [Qemu-devel] [PATCH 2/2] Tests: QEMUSizedBuffer/QEMUBuffer List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Yang Hongyang Cc: amit.shah@redhat.com, qemu-devel@nongnu.org, Juan Quintela * Yang Hongyang (yanghy@cn.fujitsu.com) wrote: > Modify some of tests/test-vmstate.c due to qemu_bufopen() change. > If you create a QEMUSizedBuffer yourself, you have to explicitly > free it. > > Signed-off-by: Yang Hongyang > Cc: Dr. David Alan Gilbert > Cc: Eric Blake > Cc: Juan Quintela Reviewed-by: Dr. David Alan Gilbert > --- > tests/test-vmstate.c | 20 ++++++++------------ > 1 file changed, 8 insertions(+), 12 deletions(-) > > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index 5e0fd13..39b7b01 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -60,16 +60,6 @@ static QEMUFile *open_test_file(bool write) > return qemu_fdopen(fd, write ? "wb" : "rb"); > } > > -/* Open a read-only qemu-file from an existing memory block */ > -static QEMUFile *open_mem_file_read(const void *data, size_t len) > -{ > - /* The qsb gets freed by qemu_fclose */ > - QEMUSizedBuffer *qsb = qsb_create(data, len); > - g_assert(qsb); > - > - return qemu_bufopen("r", qsb); > -} > - > /* > * Check that the contents of the memory-buffered file f match > * the given size/data. > @@ -450,7 +440,9 @@ static void test_load_noskip(void) > QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ > }; > > - QEMUFile *loading = open_mem_file_read(buf, sizeof(buf)); > + QEMUSizedBuffer *qsb = qsb_create(buf, sizeof(buf)); > + g_assert(qsb); > + QEMUFile *loading = qemu_bufopen("r", qsb); > TestStruct obj = { .skip_c_e = false }; > vmstate_load_state(loading, &vmstate_skipping, &obj, 2); > g_assert(!qemu_file_get_error(loading)); > @@ -461,6 +453,7 @@ static void test_load_noskip(void) > g_assert_cmpint(obj.e, ==, 50); > g_assert_cmpint(obj.f, ==, 60); > qemu_fclose(loading); > + qsb_free(qsb); > } > > static void test_load_skip(void) > @@ -473,7 +466,9 @@ static void test_load_skip(void) > QEMU_VM_EOF, /* just to ensure we won't get EOF reported prematurely */ > }; > > - QEMUFile *loading = open_mem_file_read(buf, sizeof(buf)); > + QEMUSizedBuffer *qsb = qsb_create(buf, sizeof(buf)); > + g_assert(qsb); > + QEMUFile *loading = qemu_bufopen("r", qsb); > TestStruct obj = { .skip_c_e = true, .c = 300, .e = 500 }; > vmstate_load_state(loading, &vmstate_skipping, &obj, 2); > g_assert(!qemu_file_get_error(loading)); > @@ -484,6 +479,7 @@ static void test_load_skip(void) > g_assert_cmpint(obj.e, ==, 500); > g_assert_cmpint(obj.f, ==, 60); > qemu_fclose(loading); > + qsb_free(qsb); > } > > int main(int argc, char **argv) > -- > 1.9.1 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK