From patchwork Mon Aug 20 17:15:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959844 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu 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 41vLCG3mrxz9s4v for ; Tue, 21 Aug 2018 03:19:38 +1000 (AEST) Received: from localhost ([::1]:48275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frnq4-0000XV-6N for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 13:19:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frnn2-0007Cl-1j for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frnmx-0003Du-94 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:28 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:44293) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frnmw-0003DF-V8 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0LyQ4I-1fwUIt0tfi-015stl; Mon, 20 Aug 2018 19:16:13 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 19:15:57 +0200 Message-Id: <20180820171557.7734-5-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180820171557.7734-1-laurent@vivier.eu> References: <20180820171557.7734-1-laurent@vivier.eu> X-Provags-ID: V03:K1:LE9TUuell6cujCLePXAuICCwxKODPMzc5hDNIPm+Evk+COnjkV7 ofDpe33LR+1f19A7IvXEqfAURbmUiDDCDXagi65QQ9ImJ9YE9MzG+14HJJKSb9G2yJKfaIZ cu9yhoWR+vYj5uqxVryVURO/ecaoRIZQEiW2V1EWR8kOJ+a/ifcS2DZsivvRBi6zqRJkq59 cSfCUJ4SgFWxYtKOMmq6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:0MiBLKk/Lro=:YImJFkNOomB4ui2HzQn6XD cHIuIOXQmT7Xtkwbv6yryEU0FNJYI2DLRfaThti+xyuXQf0qj683iEBHU/amabu8RPQFMeqcf s1GWF2Cy8M+GOUeZaEqGvTh1qxX1MY/WLrwO13eA2xC3v9NEEgDSUcghbfTLInmIAvXn94aRU 15OjQPRcTbRMCAVYtK5E5EdqXof2k9osECLXadxUuH+5NM6jLf7SJKrLCaN1DLVTpNoiFjt+2 JGAdoVULIq2IDp+Vsek8ffLBOcmLG9aoL7hd0ghyQXD+kzaczMKLdfL4GVjrJwgxjm8hqKRFD q2iMdEA6IGGk1qKCJoghuvCO1JI4aokDC7TYOHbjrmMAhWtkASp5cFb2Q2hoHOmmxr3CEfq62 oyD+U2PZN/ogDWyJL9CNOi9aJK71iH0olZULgg11jRI+HZ+d6XDXKv5zxNwuFbCPrtsAh6EYx 7SZfF84h2hg3KmMdx63A/Bk+EubDeSg0qvTjgwIljQP0fay1mfenpoJb345FKuu9CdQF5oMaL jEcDvqJ+EEe+2M5yTzHVyWrEla56tgQYyXhPz/XbQzg+M/reOo5oGqn0rRoOK+GnJCScr8a0v nXzwfnFRLA9MLLSYuJcCaRbQmInK+b/zu/nZmjbQ8uHu9HC0TDYfYcQ7TzslepL55Hr2oAw4w B4SnlvNU70/2gWNsMy6Mhuu/NFFl63E2vvgcug04DZnQDOwrKW4VrgMPFo345MysKN64= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.187 Subject: [Qemu-devel] [PATCH v2 4/4] linux-user: add QEMU_IFLA_INFO_KIND nested type for tun 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: Peter Maydell , Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell --- linux-user/syscall.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 197010945f..f1e5d1bd79 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -501,6 +501,20 @@ enum { QEMU___IFLA_BRPORT_MAX }; +enum { + QEMU_IFLA_TUN_UNSPEC, + QEMU_IFLA_TUN_OWNER, + QEMU_IFLA_TUN_GROUP, + QEMU_IFLA_TUN_TYPE, + QEMU_IFLA_TUN_PI, + QEMU_IFLA_TUN_VNET_HDR, + QEMU_IFLA_TUN_PERSIST, + QEMU_IFLA_TUN_MULTI_QUEUE, + QEMU_IFLA_TUN_NUM_QUEUES, + QEMU_IFLA_TUN_NUM_DISABLED_QUEUES, + QEMU___IFLA_TUN_MAX, +}; + enum { QEMU_IFLA_INFO_UNSPEC, QEMU_IFLA_INFO_KIND, @@ -2346,6 +2360,34 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, return 0; } +static abi_long host_to_target_data_tun_nlattr(struct nlattr *nlattr, + void *context) +{ + uint32_t *u32; + + switch (nlattr->nla_type) { + /* uint8_t */ + case QEMU_IFLA_TUN_TYPE: + case QEMU_IFLA_TUN_PI: + case QEMU_IFLA_TUN_VNET_HDR: + case QEMU_IFLA_TUN_PERSIST: + case QEMU_IFLA_TUN_MULTI_QUEUE: + break; + /* uint32_t */ + case QEMU_IFLA_TUN_NUM_QUEUES: + case QEMU_IFLA_TUN_NUM_DISABLED_QUEUES: + case QEMU_IFLA_TUN_OWNER: + case QEMU_IFLA_TUN_GROUP: + u32 = NLA_DATA(nlattr); + *u32 = tswap32(*u32); + break; + default: + gemu_log("Unknown QEMU_IFLA_TUN type %d\n", nlattr->nla_type); + break; + } + return 0; +} + struct linkinfo_context { int len; char *name; @@ -2380,6 +2422,12 @@ static abi_long host_to_target_data_linkinfo_nlattr(struct nlattr *nlattr, nlattr->nla_len, NULL, host_to_target_data_bridge_nlattr); + } else if (strncmp(li_context->name, "tun", + li_context->len) == 0) { + return host_to_target_for_each_nlattr(NLA_DATA(nlattr), + nlattr->nla_len, + NULL, + host_to_target_data_tun_nlattr); } else { gemu_log("Unknown QEMU_IFLA_INFO_KIND %s\n", li_context->name); }