From patchwork Tue Oct 18 10:57:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Halil Pasic X-Patchwork-Id: 9381889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 43308607D0 for ; Tue, 18 Oct 2016 11:02:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33EF429528 for ; Tue, 18 Oct 2016 11:02:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2724629531; Tue, 18 Oct 2016 11:02:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A5D4F29528 for ; Tue, 18 Oct 2016 11:02:53 +0000 (UTC) Received: from localhost ([::1]:40336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwSAW-0005KK-Sm for patchwork-qemu-devel@patchwork.kernel.org; Tue, 18 Oct 2016 07:02:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bwS5Z-0001Rv-Rg 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 1bwS5X-0006je-56 for qemu-devel@nongnu.org; Tue, 18 Oct 2016 06:57:45 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:57141) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bwS5W-0006j7-Tf for qemu-devel@nongnu.org; Tue, 18 Oct 2016 06:57:43 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u9IAsSgZ031138 for ; Tue, 18 Oct 2016 06:57:42 -0400 Received: from e06smtp08.uk.ibm.com (e06smtp08.uk.ibm.com [195.75.94.104]) by mx0a-001b2d01.pphosted.com with ESMTP id 265cw6qag9-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 18 Oct 2016 06:57:41 -0400 Received: from localhost by e06smtp08.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 d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp08.uk.ibm.com (192.168.101.138) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 18 Oct 2016 11:57:37 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 20A7C2190063 for ; Tue, 18 Oct 2016 11:56:54 +0100 (BST) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u9IAvb4q4980756 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 u9IAvaCl009841 for ; Tue, 18 Oct 2016 06:57:37 -0400 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u9IAvZ53009777 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA256 bits=256 verify=NO); Tue, 18 Oct 2016 06:57:36 -0400 From: Halil Pasic To: qemu-devel@nongnu.org Date: Tue, 18 Oct 2016 12:57:23 +0200 X-Mailer: git-send-email 2.8.4 In-Reply-To: <20161018105724.26520-1-pasic@linux.vnet.ibm.com> References: <20161018105724.26520-1-pasic@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16101810-0032-0000-0000-0000022A4453 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16101810-0033-0000-0000-00001D504870 Message-Id: <20161018105724.26520-4-pasic@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-10-18_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610180184 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH 3/4] Revert "tests/test-vmstate.c: prove VMStateField.start broken" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Amit Shah , Halil Pasic , Guenther Hutzl , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This reverts the effect of the previous patch in the series as a preparation for getting rid of VMStateField.start. Signed-off-by: Halil Pasic Reviewed-by: Guenther Hutzl --- tests/test-vmstate.c | 48 ------------------------------------------------ 1 file changed, 48 deletions(-) diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index a2ef4a8..4ea64b7 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -588,53 +588,6 @@ 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); @@ -650,7 +603,6 @@ 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);