From: Alexander Mikhalitsyn <alexander@mihalicyn.com>
To: qemu-devel@nongnu.org
Cc: "Alexander Mikhalitsyn" <alexander@mihalicyn.com>,
"Peter Xu" <peterx@redhat.com>, "Fabiano Rosas" <farosas@suse.de>,
"Jesper Devantier" <foss@defmacro.it>,
"Klaus Jensen" <its@irrelevant.dk>,
"Stéphane Graber" <stgraber@stgraber.org>,
qemu-block@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Keith Busch" <kbusch@kernel.org>, "Fam Zheng" <fam@euphon.net>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Zhao Liu" <zhao1.liu@intel.com>, "Kevin Wolf" <kwolf@redhat.com>,
"Alexander Mikhalitsyn" <aleksandr.mikhalitsyn@futurfusion.io>
Subject: [PATCH v5 3/8] tests/unit/test-vmstate: add tests for VMS_ARRAY_OF_POINTER_ALLOW_NULL
Date: Tue, 17 Mar 2026 11:27:03 +0100 [thread overview]
Message-ID: <20260317102708.126725-4-alexander@mihalicyn.com> (raw)
In-Reply-To: <20260317102708.126725-1-alexander@mihalicyn.com>
From: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
Add tests for VMSTATE_VARRAY_OF_POINTER{,_TO_STRUCT}_UINT32_ALLOC.
Signed-off-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
---
tests/unit/test-vmstate.c | 157 ++++++++++++++++++++++++++++++++++++++
1 file changed, 157 insertions(+)
diff --git a/tests/unit/test-vmstate.c b/tests/unit/test-vmstate.c
index cadbab3c5e2..d10cf34fc75 100644
--- a/tests/unit/test-vmstate.c
+++ b/tests/unit/test-vmstate.c
@@ -702,6 +702,155 @@ static void test_arr_ptr_prim_0_load(void)
}
}
+static uint8_t wire_arr_ptr_with_nulls[] = {
+ VMS_NOTNULLPTR_MARKER,
+ 0x00, 0x00, 0x00, 0x00,
+ VMS_NULLPTR_MARKER,
+ VMS_NOTNULLPTR_MARKER,
+ 0x00, 0x00, 0x00, 0x02,
+ VMS_NOTNULLPTR_MARKER,
+ 0x00, 0x00, 0x00, 0x03,
+ QEMU_VM_EOF
+};
+
+typedef struct {
+ uint32_t ar_items_num;
+ TestStructTriv **ar;
+} TestVArrayOfPtrToStuctWithNULLs;
+
+const VMStateDescription vmsd_arps_with_nulls = {
+ .name = "test/arps_with_nulls",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_VARRAY_OF_POINTER_TO_STRUCT_UINT32_ALLOC(
+ ar, TestVArrayOfPtrToStuctWithNULLs, ar_items_num, 0, vmsd_tst, TestStructTriv),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void test_arr_ptr_nulls_str_save(void)
+{
+ TestStructTriv ar[AR_SIZE] = { {.i = 0}, {.i = 1}, {.i = 2}, {.i = 3} };
+ TestVArrayOfPtrToStuctWithNULLs sample = {};
+ int idx;
+
+ sample.ar_items_num = AR_SIZE;
+ sample.ar = g_new0(TestStructTriv*, sample.ar_items_num);
+ sample.ar[0] = g_new0(TestStructTriv, 1);
+ *sample.ar[0] = ar[0];
+ /* note, sample.ar[1] remains NULL */
+ sample.ar[2] = g_new0(TestStructTriv, 1);
+ *sample.ar[2] = ar[2];
+ sample.ar[3] = g_new0(TestStructTriv, 1);
+ *sample.ar[3] = ar[3];
+
+ save_vmstate(&vmsd_arps_with_nulls, &sample);
+ compare_vmstate(wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls));
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ g_free(sample.ar[idx]);
+ }
+ g_free(sample.ar);
+}
+
+static void test_arr_ptr_nulls_str_load(void)
+{
+ TestStructTriv ar_gt[AR_SIZE] = {{.i = 0}, {.i = 0}, {.i = 2}, {.i = 3} };
+ TestVArrayOfPtrToStuctWithNULLs obj = {};
+ int idx;
+
+ obj.ar_items_num = AR_SIZE;
+ obj.ar = g_new0(TestStructTriv*, obj.ar_items_num);
+
+ save_buffer(wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls));
+ SUCCESS(load_vmstate_one(&vmsd_arps_with_nulls, &obj, 1,
+ wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls)));
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ if (idx == 1) {
+ g_assert_cmpint((uintptr_t)(obj.ar[idx]), ==, 0);
+ } else {
+ /* compare the target array ar with the ground truth array ar_gt */
+ g_assert_cmpint(ar_gt[idx].i, ==, obj.ar[idx]->i);
+ }
+ }
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ g_free(obj.ar[idx]);
+ }
+ g_free(obj.ar);
+}
+
+typedef struct {
+ uint32_t ar_items_num;
+ int32_t **ar;
+} TestVArrayOfPtrToIntWithNULLs;
+
+const VMStateDescription vmsd_arpp_with_nulls = {
+ .name = "test/arpp_with_nulls",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (const VMStateField[]) {
+ VMSTATE_VARRAY_OF_POINTER_UINT32_ALLOC(
+ ar, TestVArrayOfPtrToIntWithNULLs, ar_items_num, 0, vmstate_info_int32, int32_t),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void test_arr_ptr_nulls_prim_save(void)
+{
+ int32_t ar[AR_SIZE] = { 0, 1, 2, 3 };
+ TestVArrayOfPtrToIntWithNULLs sample = {};
+ int idx;
+
+ sample.ar_items_num = AR_SIZE;
+ sample.ar = g_new0(int32_t*, sample.ar_items_num);
+ sample.ar[0] = g_new0(int32_t, 1);
+ *sample.ar[0] = ar[0];
+ /* note, sample.ar[1] remains NULL */
+ sample.ar[2] = g_new0(int32_t, 1);
+ *sample.ar[2] = ar[2];
+ sample.ar[3] = g_new0(int32_t, 1);
+ *sample.ar[3] = ar[3];
+
+ save_vmstate(&vmsd_arpp_with_nulls, &sample);
+ compare_vmstate(wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls));
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ g_free(sample.ar[idx]);
+ }
+ g_free(sample.ar);
+}
+
+static void test_arr_ptr_nulls_prim_load(void)
+{
+ int32_t ar_gt[AR_SIZE] = { 0, 0, 2, 3 };
+ TestVArrayOfPtrToIntWithNULLs obj = {};
+ int idx;
+
+ obj.ar_items_num = AR_SIZE;
+ obj.ar = g_new0(int32_t*, obj.ar_items_num);
+
+ save_buffer(wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls));
+ SUCCESS(load_vmstate_one(&vmsd_arpp_with_nulls, &obj, 1,
+ wire_arr_ptr_with_nulls, sizeof(wire_arr_ptr_with_nulls)));
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ if (idx == 1) {
+ g_assert_cmpint((uintptr_t)(obj.ar[idx]), ==, 0);
+ } else {
+ /* compare the target array ar with the ground truth array ar_gt */
+ g_assert_cmpint(ar_gt[idx], ==, *obj.ar[idx]);
+ }
+ }
+
+ for (idx = 0; idx < AR_SIZE; ++idx) {
+ g_free(obj.ar[idx]);
+ }
+ g_free(obj.ar);
+}
+
/* test QTAILQ migration */
typedef struct TestQtailqElement TestQtailqElement;
@@ -1568,6 +1717,14 @@ int main(int argc, char **argv)
test_arr_ptr_prim_0_save);
g_test_add_func("/vmstate/array/ptr/prim/0/load",
test_arr_ptr_prim_0_load);
+ g_test_add_func("/vmstate/array/ptr-nulls/str/save",
+ test_arr_ptr_nulls_str_save);
+ g_test_add_func("/vmstate/array/ptr-nulls/str/load",
+ test_arr_ptr_nulls_str_load);
+ g_test_add_func("/vmstate/array/ptr-nulls/prim/save",
+ test_arr_ptr_nulls_prim_save);
+ g_test_add_func("/vmstate/array/ptr-nulls/prim/load",
+ test_arr_ptr_nulls_prim_load);
g_test_add_func("/vmstate/qtailq/save/saveq", test_save_q);
g_test_add_func("/vmstate/qtailq/load/loadq", test_load_q);
g_test_add_func("/vmstate/gtree/save/savedomain", test_gtree_save_domain);
--
2.47.3
next prev parent reply other threads:[~2026-03-17 10:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-17 10:27 [PATCH v5 0/8] hw/nvme: add basic live migration support Alexander Mikhalitsyn
2026-03-17 10:27 ` [PATCH v5 1/8] migration/vmstate: export vmstate_{load, save}_field helpers Alexander Mikhalitsyn
2026-03-17 10:27 ` [PATCH v5 2/8] migration: add VMSTATE_VARRAY_OF_POINTER_TO_STRUCT_UINT{8, 32}_ALLOC Alexander Mikhalitsyn
2026-03-17 21:39 ` Peter Xu
2026-03-17 23:30 ` Peter Xu
2026-03-18 10:06 ` Alexander Mikhalitsyn
2026-03-18 10:05 ` Alexander Mikhalitsyn
2026-03-17 10:27 ` Alexander Mikhalitsyn [this message]
2026-03-17 10:27 ` [PATCH v5 4/8] tests/functional/migration: add VM launch/configure hooks Alexander Mikhalitsyn
2026-03-17 10:27 ` [PATCH v5 5/8] hw/nvme: add migration blockers for non-supported cases Alexander Mikhalitsyn
2026-04-07 15:34 ` Stefan Hajnoczi
2026-04-07 18:39 ` Alexander Mikhalitsyn
2026-04-08 6:32 ` Klaus Jensen
2026-04-08 11:47 ` Stefan Hajnoczi
2026-04-08 11:50 ` Alexander Mikhalitsyn
2026-03-17 10:27 ` [PATCH v5 6/8] hw/nvme: split nvme_init_sq/nvme_init_cq into helpers Alexander Mikhalitsyn
2026-03-17 10:27 ` [PATCH v5 7/8] hw/nvme: add basic live migration support Alexander Mikhalitsyn
2026-04-07 15:48 ` Stefan Hajnoczi
2026-04-07 19:02 ` Alexander Mikhalitsyn
2026-04-08 6:41 ` Klaus Jensen
2026-04-08 11:31 ` Alexander Mikhalitsyn
2026-04-08 18:35 ` Stefan Hajnoczi
2026-04-08 19:59 ` Alexander Mikhalitsyn
2026-04-08 18:27 ` Stefan Hajnoczi
2026-04-08 19:55 ` Alexander Mikhalitsyn
2026-04-09 13:36 ` Stefan Hajnoczi
2026-03-17 10:27 ` [PATCH v5 8/8] tests/functional/x86_64: add migration test for NVMe device Alexander Mikhalitsyn
2026-03-30 11:38 ` [PATCH v5 0/8] hw/nvme: add basic live migration support Alexander Mikhalitsyn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260317102708.126725-4-alexander@mihalicyn.com \
--to=alexander@mihalicyn.com \
--cc=aleksandr.mikhalitsyn@futurfusion.io \
--cc=fam@euphon.net \
--cc=farosas@suse.de \
--cc=foss@defmacro.it \
--cc=hreitz@redhat.com \
--cc=its@irrelevant.dk \
--cc=kbusch@kernel.org \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=peterx@redhat.com \
--cc=philmd@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=stgraber@stgraber.org \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.