From nobody Thu Nov 6 07:57:54 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1492670439510663.0512891929828; Wed, 19 Apr 2017 23:40:39 -0700 (PDT) Received: from localhost ([::1]:51902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d15ld-0005h8-V8 for importer@patchew.org; Thu, 20 Apr 2017 02:40:38 -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 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 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17962616" 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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" =20 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 =3D DO_UPCAST(NetSocketState, nc, nc); + VirtIONet *n =3D qemu_get_nic_opaque(nc->peer); uint32_t len =3D htonl(size); + uint32_t vnet_hdr_len =3D htonl(n->guest_hdr_len); struct iovec iov[] =3D { { .iov_base =3D &len, .iov_len =3D sizeof(len), }, { + .iov_base =3D &vnet_hdr_len, + .iov_len =3D sizeof(vnet_hdr_len), + }, { .iov_base =3D (void *)buf, .iov_len =3D size, }, --=20 2.7.4