From patchwork Thu Apr 20 06:39:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 9689585 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 10EA960326 for ; Thu, 20 Apr 2017 06:40:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0397B280B0 for ; Thu, 20 Apr 2017 06:40:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC62928459; Thu, 20 Apr 2017 06:40:12 +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 9FB48280B0 for ; Thu, 20 Apr 2017 06:40:12 +0000 (UTC) Received: from localhost ([::1]:51890 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d15lD-0004Xz-RD for patchwork-qemu-devel@patchwork.kernel.org; Thu, 20 Apr 2017 02:40:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41037) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d15k2-0004Vr-Ma for qemu-devel@nongnu.org; Thu, 20 Apr 2017 02:38:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d15k1-0005Uz-Qk for qemu-devel@nongnu.org; Thu, 20 Apr 2017 02:38:58 -0400 Received: from [59.151.112.132] (port=46559 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d15k1-0005Uj-E1 for qemu-devel@nongnu.org; Thu, 20 Apr 2017 02:38:57 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17962616" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 20 Apr 2017 14:38:57 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id AD09647E6343; Thu, 20 Apr 2017 14:38:52 +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; Thu, 20 Apr 2017 14:38:51 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Thu, 20 Apr 2017 14:39:04 +0800 Message-ID: <1492670346-18004-5-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1492670346-18004-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> References: <1492670346-18004-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: AD09647E6343.AACEF 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 V2 4/6] net/socket.c: Add vnet packet support in net_socket_receive() 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: Li Zhijian , bian naimeng , "eddie . dong" , zhanghailiang , Zhang Chen Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Because of net_socket_send() add vnet header length argument, Avoid conflict with net_socket_send(). Signed-off-by: Zhang Chen --- net/socket.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/net/socket.c b/net/socket.c index fe3547b..1f1f3d2 100644 --- a/net/socket.c +++ b/net/socket.c @@ -33,6 +33,7 @@ #include "qemu/sockets.h" #include "qemu/iov.h" #include "qemu/main-loop.h" +#include "hw/virtio/virtio-net.h" typedef struct NetSocketState { NetClientState nc; @@ -81,12 +82,17 @@ static void net_socket_writable(void *opaque) static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf, size_t size) { NetSocketState *s = DO_UPCAST(NetSocketState, nc, nc); + VirtIONet *n = qemu_get_nic_opaque(nc->peer); uint32_t len = htonl(size); + uint32_t vnet_hdr_len = htonl(n->guest_hdr_len); struct iovec iov[] = { { .iov_base = &len, .iov_len = sizeof(len), }, { + .iov_base = &vnet_hdr_len, + .iov_len = sizeof(vnet_hdr_len), + }, { .iov_base = (void *)buf, .iov_len = size, },