From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c438d-0000zp-5Y for qemu-devel@nongnu.org; Tue, 08 Nov 2016 04:56:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c438Y-0006un-RD for qemu-devel@nongnu.org; Tue, 08 Nov 2016 04:56:19 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:38070) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c438Y-0006tr-Jo for qemu-devel@nongnu.org; Tue, 08 Nov 2016 04:56:14 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uA89s9Uv037107 for ; Tue, 8 Nov 2016 04:56:13 -0500 Received: from e06smtp12.uk.ibm.com (e06smtp12.uk.ibm.com [195.75.94.108]) by mx0a-001b2d01.pphosted.com with ESMTP id 26k98d1ymb-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 08 Nov 2016 04:56:13 -0500 Received: from localhost by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 8 Nov 2016 09:56:10 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 21E4A17D806A for ; Tue, 8 Nov 2016 09:58:30 +0000 (GMT) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps3074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uA89u9Mp43581578 for ; Tue, 8 Nov 2016 09:56:09 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id uA89u9Lc029350 for ; Tue, 8 Nov 2016 02:56:09 -0700 From: Halil Pasic Date: Tue, 8 Nov 2016 10:56:03 +0100 In-Reply-To: <20161108095603.72301-1-pasic@linux.vnet.ibm.com> References: <20161108095603.72301-1-pasic@linux.vnet.ibm.com> Message-Id: <20161108095603.72301-9-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v2 8/8] tests/test-vmstate.c: add array of pointers to struct with NULL List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Juan Quintela , Guenther Hutzl , "Dr. David Alan Gilbert" , Halil Pasic Increase coverage by testing VMSTATE_ARRAY_OF_POINTER_TO_STRUCT with an array containing some NULL pointer. Signed-off-by: Halil Pasic --- tests/test-vmstate.c | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index aa1ccf1..5394119 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -651,6 +651,44 @@ static void test_arr_ptr_str_no0_load(void) } } +static void test_arr_ptr_str_0_save(void) +{ + TestStructTriv ar[AR_SIZE] = {{.i = 0}, {.i = 1}, {.i = 2}, {.i = 3} }; + TestArrayOfPtrToStuct sample = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; + + save_vmstate(&vmsd_arps, &sample); /* fails with SEGFAULT with master */ +} + +static void test_arr_ptr_str_0_load(void) +{ + TestStructTriv ar_gt[AR_SIZE] = {{.i = 0}, {.i = 0}, {.i = 2}, {.i = 3} }; + TestStructTriv ar[AR_SIZE] = {}; + TestArrayOfPtrToStuct obj = {.ar = {&ar[0], NULL, &ar[2], &ar[3]} }; + int idx; + uint8_t wire_sample[] = { + 0x00, 0x00, 0x00, 0x00, + VMS_NULLPTR_MARKER, + 0x00, 0x00, 0x00, 0x02, + 0x00, 0x00, 0x00, 0x03, + QEMU_VM_EOF + }; + + save_buffer(wire_sample, sizeof(wire_sample)); + SUCCESS(load_vmstate_one(&vmsd_arps, &obj, 1, + wire_sample, sizeof(wire_sample))); + for (idx = 0; idx < AR_SIZE; ++idx) { + /* compare the target array ar with the ground truth array ar_gt */ + g_assert_cmpint(ar_gt[idx].i, ==, ar[idx].i); + } + for (idx = 0; idx < AR_SIZE; ++idx) { + if (idx == 1) { + g_assert_cmpint((uint64_t)(obj.ar[idx]), ==, 0); + } else { + g_assert_cmpint((uint64_t)(obj.ar[idx]), !=, 0); + } + } +} + int main(int argc, char **argv) { temp_fd = mkstemp(temp_file); @@ -670,6 +708,9 @@ int main(int argc, char **argv) test_arr_ptr_str_no0_save); g_test_add_func("/vmstate/array/ptr/str/no0/load", test_arr_ptr_str_no0_load); + g_test_add_func("/vmstate/array/ptr/str/0/save", test_arr_ptr_str_0_save); + g_test_add_func("/vmstate/array/ptr/str/0/load", + test_arr_ptr_str_0_load); g_test_run(); close(temp_fd); -- 2.8.4