From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 615BFFD7072 for ; Tue, 17 Mar 2026 10:29:43 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2ReR-00021I-CM; Tue, 17 Mar 2026 06:27:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2Rdx-0001vg-CD for qemu-devel@nongnu.org; Tue, 17 Mar 2026 06:27:22 -0400 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w2Rdr-0006Vs-Jk for qemu-devel@nongnu.org; Tue, 17 Mar 2026 06:27:18 -0400 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-48334ee0aeaso48942005e9.1 for ; Tue, 17 Mar 2026 03:27:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mihalicyn.com; s=mihalicyn; t=1773743233; x=1774348033; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tVGscBXdfGh8fDEwqpswNHuWUNoSPZVqRG0/M7ov0/8=; b=X48yjoPjfBdx4KRlgS0Zn4GjSEvTMREBi0L5KN2CIIxfZY8c2mZjqvfOyC5nfgcrUL IKwP1sG3bR00VYAine5Ft2Bc0vsqefqQ0o3vHWw/rud+zF+DQxFKmNm0GZFqOZAoZmMA NIlLMwGBXrt0HdDidcKRnVwQQhfe4MdjyfyEQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773743233; x=1774348033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=tVGscBXdfGh8fDEwqpswNHuWUNoSPZVqRG0/M7ov0/8=; b=IUAUElQG8eQ0d0cPJLjodhG+cWpC38Oi2/jwmq9KjQ/HkNGyPAeYBxr3AbX0e2/86g TmGPRKYD777RKhVwnNHOuyFn2gpt+MnvPrVbp3Ba4ZgFYdpWahlsDYwlcHriWZi5bkdN s8oNIjzoiSFcogxpyi0dZtbQsixibf6bFDj8azSDb5zHahJfIyUkoxECfIgkfvJvDH+O +tdjDfUU6RMppoZ7uFlKypqh5RLcc8o+lDkK7bKXvIhN47xhkZDRx5SsH9UYNdaB94N7 AJjjOths3NBNMVRvDA7Qz+6j+y9sD/vxWHw402+RaUb6OkOJ/v5iCGjnxkFx2hKax255 eLxw== X-Gm-Message-State: AOJu0YyChrWLs66LvX0UaFBiLsd0yu1iLeY1s6PGGTUvdYR9+RqAL7ck WaQz4qyl/bOFKTUgqoU73yPwNinSj5czvz1dmT8FfN92eWCVic5BeNlWeJ9FDxzbcH3a4wNnNhe Sb6+00Ls= X-Gm-Gg: ATEYQzz2uFD5Cc3PmwYz5jEb1CzGiUjSlkXIcFHQpeZMf0nK2PVGpqTKlQVyv/5LRkj jOA4EDQ0ymXFeO94YzZ5WdeHsssEsxJcDXhf6RgA40Pc3cGSJSSoreIvZtk5lo65fEkh9njLOXN gkI62fDsxZNT0Xa3NMThMPZ8ZLkMWRVh8fhkC8570vAVeH1ObhKAHGrtp2NXXebHJJc+Vf98FHm qBQVg3rjj1mPayvXn6BD7D/CoPDOi8fp50j74L3i0FzI0CS4YLRMtaMGpRx4VRB6JIaxrFlpmeB acsJ7oGNKFulNrdQYPEHJgpMS9k/O7ymdb3RMizCFDqPacRf0ZMGjgj2mscfz6MxNFT3V+PK7N+ RXPzZwwdTt+TjlXFDZvFeCh6s09jd33V78oO515Eb36rVO0EFfQLZFwclCHdyGtbYFr78VBlmY2 47JUpYf0UPU3oh4yGT7jwzhGeYkdAzWrvoj0WFKA17ALDEVgZHqswmXpwLpVrsFlmIPeUCq0Zio b8KDoFXU249BKNgojpKEQo= X-Received: by 2002:a05:600c:1913:b0:483:6a8d:b2f9 with SMTP id 5b1f17b1804b1-485566e2d50mr277093135e9.5.1773743233329; Tue, 17 Mar 2026 03:27:13 -0700 (PDT) Received: from alex-laptop.lan (p200300cf57228c0051af80c54da1a9bc.dip0.t-ipconnect.de. [2003:cf:5722:8c00:51af:80c5:4da1:a9bc]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4856ea9c36bsm61977665e9.9.2026.03.17.03.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Mar 2026 03:27:12 -0700 (PDT) From: Alexander Mikhalitsyn To: qemu-devel@nongnu.org Cc: Alexander Mikhalitsyn , Peter Xu , Fabiano Rosas , Jesper Devantier , Klaus Jensen , =?UTF-8?q?St=C3=A9phane=20Graber?= , qemu-block@nongnu.org, Stefan Hajnoczi , Hanna Reitz , Paolo Bonzini , Keith Busch , Fam Zheng , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Zhao Liu , Kevin Wolf , Alexander Mikhalitsyn 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 Message-ID: <20260317102708.126725-4-alexander@mihalicyn.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260317102708.126725-1-alexander@mihalicyn.com> References: <20260317102708.126725-1-alexander@mihalicyn.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::329; envelope-from=alexander@mihalicyn.com; helo=mail-wm1-x329.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Alexander Mikhalitsyn Add tests for VMSTATE_VARRAY_OF_POINTER{,_TO_STRUCT}_UINT32_ALLOC. Signed-off-by: Alexander Mikhalitsyn --- 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