From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwS5Z-0001RR-Ck for qemu-devel@nongnu.org; Tue, 18 Oct 2016 06:57:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bwS5W-0006j2-Ah for qemu-devel@nongnu.org; Tue, 18 Oct 2016 06:57:45 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:59299 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwS5W-0006ix-5y for qemu-devel@nongnu.org; Tue, 18 Oct 2016 06:57:42 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9IAsTmN085034 for ; Tue, 18 Oct 2016 06:57:41 -0400 Received: from e06smtp09.uk.ibm.com (e06smtp09.uk.ibm.com [195.75.94.105]) by mx0b-001b2d01.pphosted.com with ESMTP id 265cjag5ka-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 18 Oct 2016 06:57:41 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 18 Oct 2016 11:57:39 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 5B83817D8067 for ; Tue, 18 Oct 2016 11:59:48 +0100 (BST) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u9IAvbEP65011740 for ; Tue, 18 Oct 2016 10:57:37 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u9IAva8g009823 for ; Tue, 18 Oct 2016 06:57:36 -0400 From: Halil Pasic Date: Tue, 18 Oct 2016 12:57:22 +0200 In-Reply-To: <20161018105724.26520-1-pasic@linux.vnet.ibm.com> References: <20161018105724.26520-1-pasic@linux.vnet.ibm.com> Message-Id: <20161018105724.26520-3-pasic@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 2/4] tests/test-vmstate.c: prove VMStateField.start broken List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Amit Shah , Guenther Hutzl , "Dr. David Alan Gilbert" , Halil Pasic The handling of VMStateField.start is currently quite broken if VMS_ALLOC is present (that is for VMSTATE_VBUFFER_ALLOC_UINT32) but fortunately also quite underutilized -- nobody is using .start != 0. Let's prove with this patch that it's really broken (as a first step towards fixing things up). Signed-off-by: Halil Pasic Reviewed-by: Guenther Hutzl --- The idea is to remove .start support and this patch should be reverted, as soon this happens, or even better just dropped. If however dropping the support for .start encounters resistance, this patch should prove useful in an unexpected way. --- tests/test-vmstate.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 9a57aa0..a2ef4a8 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -588,6 +588,53 @@ static void test_complex_vbuffer(void) #undef FIELD_EQUAL #undef BUFFER_EQUAL +typedef struct { + uint32_t vbuff_size; + uint8_t *vbuff; + uint64_t stuff; +} TestVBufStart; + +static const VMStateDescription vmstate_vbuff_alloc_start = { + .name = "test/vbuff_alloc_start", + .version_id = 1, + .minimum_version_id = 1, + .fields = (VMStateField[]) { + VMSTATE_UINT64(stuff, TestVBufStart), + VMSTATE_UINT32(vbuff_size, TestVBufStart), + VMSTATE_VBUFFER_ALLOC_UINT32(vbuff, TestVBufStart, 1, 0, 1, vbuff_size), + VMSTATE_END_OF_LIST() + } + +}; + +static void load_vmstate_one_obj(const VMStateDescription *vmsd, void *obj, + int version_id) +{ + QEMUFile *fload = open_test_file(false); + + SUCCESS(vmstate_load_state(fload, vmsd, obj, version_id)); + qemu_fclose(fload); +} + +static void test_vbuff_alloc_start(void) +{ + uint8_t my_vbuff1[] = {0, 1, 2, 3}; + uint8_t my_vbuff2[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; + TestVBufStart sample = { + .stuff = 1, + .vbuff_size = 3, + .vbuff = my_vbuff1, + }; + TestVBufStart load_obj = { + .vbuff = my_vbuff2, + }; + + save_vmstate(&vmstate_vbuff_alloc_start, &sample); + load_vmstate_one_obj(&vmstate_vbuff_alloc_start, &load_obj, 1); + g_assert_cmpint(load_obj.stuff, ==, 0); + g_assert_cmpint((uint64_t) load_obj.vbuff, !=, (uint64_t) my_vbuff2); +} + int main(int argc, char **argv) { temp_fd = mkstemp(temp_file); @@ -603,8 +650,8 @@ int main(int argc, char **argv) g_test_add_func("/vmstate/field_exists/save/noskip", test_save_noskip); g_test_add_func("/vmstate/field_exists/save/skip", test_save_skip); g_test_add_func("/vmstate/complex/vbuffer", test_complex_vbuffer); + g_test_add_func("/vmstate/vbuff/alloc_start", test_vbuff_alloc_start); g_test_run(); - close(temp_fd); unlink(temp_file); -- 2.8.4