| Message ID | 20200220134103.26224-1-kuhn.chenqun@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] test-vmstate: Fix memleaks in test_load_qlist | expand |
Le 20/02/2020 à 14:41, kuhn.chenqun@huawei.com a écrit : > From: Chen Qun <kuhn.chenqun@huawei.com> > > There is memleak in test_load_qlist().It's not a big deal, > but test-vmstate will fail if sanitizers is enabled. > > In addition, "ret" is written twice with the same value > in test_gtree_load_iommu(). > > Reported-by: Euler Robot <euler.robot@huawei.com> > Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com> > --- > tests/test-vmstate.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c > index cea363dd69..f7b3868881 100644 > --- a/tests/test-vmstate.c > +++ b/tests/test-vmstate.c > @@ -1241,7 +1241,6 @@ static void test_gtree_load_iommu(void) > TestGTreeIOMMU *orig_iommu = create_iommu(); > QEMUFile *fsave, *fload; > char eof; > - int ret; > > fsave = open_test_file(true); > qemu_put_buffer(fsave, iommu_dump, sizeof(iommu_dump)); > @@ -1250,10 +1249,8 @@ static void test_gtree_load_iommu(void) > > fload = open_test_file(false); > vmstate_load_state(fload, &vmstate_iommu, dest_iommu, 1); > - ret = qemu_file_get_error(fload); > eof = qemu_get_byte(fload); > - ret = qemu_file_get_error(fload); > - g_assert(!ret); > + g_assert(!qemu_file_get_error(fload));/ > g_assert_cmpint(orig_iommu->id, ==, dest_iommu->id); > g_assert_cmpint(eof, ==, QEMU_VM_EOF); > > @@ -1395,6 +1392,7 @@ static void test_load_qlist(void) > compare_containers(orig_container, dest_container); > free_container(orig_container); > free_container(dest_container); > + qemu_fclose(fload); > } > > typedef struct TmpTestStruct { > Reviewed-by: Laurent Vivier <laurent@vivier.eu>
<kuhn.chenqun@huawei.com> wrote: > From: Chen Qun <kuhn.chenqun@huawei.com> > > There is memleak in test_load_qlist().It's not a big deal, > but test-vmstate will fail if sanitizers is enabled. > > In addition, "ret" is written twice with the same value > in test_gtree_load_iommu(). > > Reported-by: Euler Robot <euler.robot@huawei.com> > Signed-off-by: Chen Qun <kuhn.chenqun@huawei.com> Reviewed-by: Juan Quintela <quintela@redhat.com> queued
diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index cea363dd69..f7b3868881 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -1241,7 +1241,6 @@ static void test_gtree_load_iommu(void) TestGTreeIOMMU *orig_iommu = create_iommu(); QEMUFile *fsave, *fload; char eof; - int ret; fsave = open_test_file(true); qemu_put_buffer(fsave, iommu_dump, sizeof(iommu_dump)); @@ -1250,10 +1249,8 @@ static void test_gtree_load_iommu(void) fload = open_test_file(false); vmstate_load_state(fload, &vmstate_iommu, dest_iommu, 1); - ret = qemu_file_get_error(fload); eof = qemu_get_byte(fload); - ret = qemu_file_get_error(fload); - g_assert(!ret); + g_assert(!qemu_file_get_error(fload)); g_assert_cmpint(orig_iommu->id, ==, dest_iommu->id); g_assert_cmpint(eof, ==, QEMU_VM_EOF); @@ -1395,6 +1392,7 @@ static void test_load_qlist(void) compare_containers(orig_container, dest_container); free_container(orig_container); free_container(dest_container); + qemu_fclose(fload); } typedef struct TmpTestStruct {