From patchwork Fri Apr 28 09:47:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9704343 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 51D02602B7 for ; Fri, 28 Apr 2017 09:50:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4065C28663 for ; Fri, 28 Apr 2017 09:50:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 339A828667; Fri, 28 Apr 2017 09:50:58 +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 AE28D280CF for ; Fri, 28 Apr 2017 09:50:57 +0000 (UTC) Received: from localhost ([::1]:36097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42YD-0006QL-1x for patchwork-qemu-devel@patchwork.kernel.org; Fri, 28 Apr 2017 05:50:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Ux-0004f0-5h for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d42Ut-0001U6-DM for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:35 -0400 Received: from [59.151.112.132] (port=49865 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Ut-0001QD-0o for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:31 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18277679" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 28 Apr 2017 17:47:26 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id A804547E6349; Fri, 28 Apr 2017 17:47:24 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 28 Apr 2017 17:47:24 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 28 Apr 2017 17:47:17 +0800 Message-ID: <1493372840-24551-8-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1493372840-24551-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1493372840-24551-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: A804547E6349.ACF02 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH V3 07/10] tests/virtio-net-test.c : change virtio-net test case iov send data format 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: zhanghailiang , Li Zhijian , weifuqiang , "eddie . dong" , Zhang Chen , bian naimeng Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Because we change net_fill_rstate() date format from struct {int size; const uint8_t buf[];} to {int size; int vnet_hdr_len; const uint8_t buf[];}. So, we add fake vnet_hdr_len in virtio-net test case. Signed-off-by: Zhang Chen --- tests/virtio-net-test.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/virtio-net-test.c b/tests/virtio-net-test.c index 8f94360..93f4fe0 100644 --- a/tests/virtio-net-test.c +++ b/tests/virtio-net-test.c @@ -89,11 +89,15 @@ static void rx_test(QVirtioDevice *dev, char test[] = "TEST"; char buffer[64]; int len = htonl(sizeof(test)); + int vnet_hdr_len = 0; struct iovec iov[] = { { .iov_base = &len, .iov_len = sizeof(len), }, { + .iov_base = &vnet_hdr_len, + .iov_len = sizeof(vnet_hdr_len), + }, { .iov_base = test, .iov_len = sizeof(test), }, @@ -105,8 +109,9 @@ static void rx_test(QVirtioDevice *dev, free_head = qvirtqueue_add(vq, req_addr, 64, true, false); qvirtqueue_kick(dev, vq, free_head); - ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); - g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); + ret = iov_send(socket, iov, 3, 0, sizeof(len) + + sizeof(test) + sizeof(vnet_hdr_len)); + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len) + sizeof(vnet_hdr_len)); qvirtio_wait_queue_isr(dev, vq, QVIRTIO_NET_TIMEOUT_US); memread(req_addr + VNET_HDR_SIZE, buffer, sizeof(test)); @@ -151,12 +156,16 @@ static void rx_stop_cont_test(QVirtioDevice *dev, char test[] = "TEST"; char buffer[64]; int len = htonl(sizeof(test)); + int vnet_hdr_len = 0; QDict *rsp; struct iovec iov[] = { { .iov_base = &len, .iov_len = sizeof(len), }, { + .iov_base = &vnet_hdr_len, + .iov_len = sizeof(vnet_hdr_len), + }, { .iov_base = test, .iov_len = sizeof(test), }, @@ -171,8 +180,9 @@ static void rx_stop_cont_test(QVirtioDevice *dev, rsp = qmp("{ 'execute' : 'stop'}"); QDECREF(rsp); - ret = iov_send(socket, iov, 2, 0, sizeof(len) + sizeof(test)); - g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len)); + ret = iov_send(socket, iov, 3, 0, sizeof(len) + + sizeof(test) + sizeof(vnet_hdr_len)); + g_assert_cmpint(ret, ==, sizeof(test) + sizeof(len) + sizeof(vnet_hdr_len)); /* We could check the status, but this command is more importantly to * ensure the packet data gets queued in QEMU, before we do 'cont'.