mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test-hbitmap: Add hbitmap_is_serializable() calls

Browse Source 
Add calls to hbitmap_is_serializable() (asserting that it returns true)
where necessary (i.e. before every series of (de-)serialization function
invocations).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20161115225746.3590-3-mreitz@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
Max Reitz 2016-11-15 23:57:46 +01:00 committed by Fam Zheng
parent 20a579de84
commit 7cdc49b9a2
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/test-hbitmap.c
View File

@ -744,6 +744,8 @@ static void test_hbitmap_serialize_granularity(TestHBitmapData *data,
int r; int r;
hbitmap_test_init(data, L3 * 2, 3); hbitmap_test_init(data, L3 * 2, 3);
g_assert(hbitmap_is_serializable(data->hb));
r = hbitmap_serialization_granularity(data->hb); r = hbitmap_serialization_granularity(data->hb);
g_assert_cmpint(r, ==, 64 << 3); g_assert_cmpint(r, ==, 64 << 3);
} }
@ -768,6 +770,8 @@ static void hbitmap_test_serialize_range(TestHBitmapData *data,
if (count) { if (count) {
hbitmap_set(data->hb, pos, count); hbitmap_set(data->hb, pos, count);
} }
g_assert(hbitmap_is_serializable(data->hb));
hbitmap_serialize_part(data->hb, buf, 0, data->size); hbitmap_serialize_part(data->hb, buf, 0, data->size);
/* Serialized buffer is inherently LE, convert it back manually to test */ /* Serialized buffer is inherently LE, convert it back manually to test */
@ -788,6 +792,8 @@ static void hbitmap_test_serialize_range(TestHBitmapData *data,
memset(buf, 0, buf_size); memset(buf, 0, buf_size);
hbitmap_serialize_part(data->hb, buf, 0, data->size); hbitmap_serialize_part(data->hb, buf, 0, data->size);
hbitmap_reset_all(data->hb); hbitmap_reset_all(data->hb);
g_assert(hbitmap_is_serializable(data->hb));
hbitmap_deserialize_part(data->hb, buf, 0, data->size, true); hbitmap_deserialize_part(data->hb, buf, 0, data->size, true);
for (i = 0; i < data->size; i++) { for (i = 0; i < data->size; i++) {
@ -810,6 +816,7 @@ static void test_hbitmap_serialize_basic(TestHBitmapData *data,
int num_positions = sizeof(positions) / sizeof(positions[0]); int num_positions = sizeof(positions) / sizeof(positions[0]);
hbitmap_test_init(data, L3, 0); hbitmap_test_init(data, L3, 0);
g_assert(hbitmap_is_serializable(data->hb));
buf_size = hbitmap_serialization_size(data->hb, 0, data->size); buf_size = hbitmap_serialization_size(data->hb, 0, data->size);
buf = g_malloc0(buf_size); buf = g_malloc0(buf_size);
@ -841,6 +848,8 @@ static void test_hbitmap_serialize_part(TestHBitmapData *data,
hbitmap_set(data->hb, positions[i], 1); hbitmap_set(data->hb, positions[i], 1);
} }
g_assert(hbitmap_is_serializable(data->hb));
for (i = 0; i < data->size; i += buf_size) { for (i = 0; i < data->size; i += buf_size) {
unsigned long *el = (unsigned long *)buf; unsigned long *el = (unsigned long *)buf;
hbitmap_serialize_part(data->hb, buf, i, buf_size); hbitmap_serialize_part(data->hb, buf, i, buf_size);
@ -879,6 +888,8 @@ static void test_hbitmap_serialize_zeroes(TestHBitmapData *data,
hbitmap_set(data->hb, positions[i], L1); hbitmap_set(data->hb, positions[i], L1);
} }
g_assert(hbitmap_is_serializable(data->hb));
for (i = 0; i < num_positions; i++) { for (i = 0; i < num_positions; i++) {
hbitmap_deserialize_zeroes(data->hb, positions[i], min_l1, true); hbitmap_deserialize_zeroes(data->hb, positions[i], min_l1, true);
hbitmap_iter_init(&iter, data->hb, 0); hbitmap_iter_init(&iter, data->hb, 0);