From patchwork Fri Apr 28 09:47:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 756304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wDpyj2mxVz9s8H for ; Fri, 28 Apr 2017 19:52:45 +1000 (AEST) Received: from localhost ([::1]:36113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Zu-00085c-Tg for incoming@patchwork.ozlabs.org; Fri, 28 Apr 2017 05:52:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d42Ux-0004f3-6F 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 1d42Uu-0001VY-Ez 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 1d42Uu-0001QD-3b for qemu-devel@nongnu.org; Fri, 28 Apr 2017 05:47:32 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="18277683" 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 DB19F47CE24C; Fri, 28 Apr 2017 17:47:23 +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:23 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 28 Apr 2017 17:47:16 +0800 Message-ID: <1493372840-24551-7-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: DB19F47CE24C.AFFA0 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 06/10] tests/e1000e-test.c : change e1000e test case 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 e1000e test case. Signed-off-by: Zhang Chen --- tests/e1000e-test.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/e1000e-test.c b/tests/e1000e-test.c index c612dc6..fb3bd77 100644 --- a/tests/e1000e-test.c +++ b/tests/e1000e-test.c @@ -329,11 +329,15 @@ static void e1000e_receive_verify(e1000e_device *d) char test[] = "TEST"; 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), }, @@ -344,8 +348,10 @@ static void e1000e_receive_verify(e1000e_device *d) int ret; /* Send a dummy packet to device's socket*/ - ret = iov_send(test_sockets[0], iov, 2, 0, sizeof(len) + sizeof(test)); - g_assert_cmpint(ret, == , sizeof(test) + sizeof(len)); + ret = iov_send(test_sockets[0], iov, 3, 0, sizeof(len) + + sizeof(vnet_hdr_len) + sizeof(test)); + g_assert_cmpint(ret, == , sizeof(test) + sizeof(len) + + sizeof(vnet_hdr_len)); /* Prepare test data buffer */ uint64_t data = guest_alloc(test_alloc, data_len);