From patchwork Sun Aug 19 22:17:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959463 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 41ts0p3Tqxz9s3Z for ; Mon, 20 Aug 2018 08:23:53 +1000 (AEST) Received: from localhost ([::1]:44292 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frW6v-0006iJ-Ty for incoming@patchwork.ozlabs.org; Sun, 19 Aug 2018 18:23:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frW1k-0002T3-4E for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frW1f-0003Pz-MQ for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:27 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:58527) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frW1f-0003Pc-EJ for qemu-devel@nongnu.org; Sun, 19 Aug 2018 18:18:23 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.183]) with ESMTPSA (Nemesis) id 0LvkQW-1fuZx52Nye-017X1t; Mon, 20 Aug 2018 00:17:27 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 00:17:07 +0200 Message-Id: <20180819221707.20693-7-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180819221707.20693-1-laurent@vivier.eu> References: <20180819221707.20693-1-laurent@vivier.eu> X-Provags-ID: V03:K1:v+hZ+bn62vDDxwM3RH/sTptXefW//S7uYBeL8ULO39Gk4GsOIJ3 uX6KAyuEvs1B7nXB7HIG7knVncMzT+1Fe32Lkvd6CCieSQ3XpfqxoRrYEjPF0FCZ3PaAWJl r3pw2ndmiy6kq/v7egXJUpR+SNSq4shi1IatsNTid19CGPO8iSaYsxAtg6nTzk0gIijGb4x Qpbh8FSfAMRq1Zt3DjYeQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:B+8+y344v60=:wwCSo2sF4u7eShMCqhNezY hnIJ1YSN50jRSGaV9fdupZkblLh1f7hgyOftIC2qqGSwAXcgi/Jmox85R4xIylkgQ65+VE6sv ipExdIY7Lk2FcOP6hwrCK3LWRLh94mERA2lGtnnewJEOQdxVhe2kNe7ASvvxWbL8OhXHBN7lW LiLYqm0pK8sbZj5UtHlQVznqtGr3Lv/Mj2KQj7EVwr9LO/JUmcERii8V5krbwFga6eWxQmLug z4Yrlr34DtdnkQxoYkErcFBR5jKY6c9TkDRI0P879DAqsuv+coHMUoksqo0a0EaOuuNKtqIX4 u0cSGUvratoUSCTZio6SM6xnsq1RhV996V+eRQP06WMW5ZaCuLa3L8tMJ2H5VyOPslmqDYGVC 8T5Xn47mqEAGDFKAareTMmjB3dL9DDgwY3tYEQ2a7j+WN9VtyoPupOCKIP/YlnMRVqeF8zHxJ S6ENQZoq7/cdzC+9fyltoNBL1H2l8xkn+GHnj+5eQ3aPPosDpmOg6vks/Ys8H99aSQ7jDn1Ix JHyyAt7kraa9bK4qduys3dbnboyRLYfjkurF406TY+5SprpgqI91bOMkea6S9W2bobf0+n65K zcDL4heFUpLTnjPUqFoVke0sZCBBdCKT6R3+7NTa4jYo+4RClnqDMb3W+agPIP2CWBgc630v1 wGvcaqSBWTIrFbL19pv+k82pUnF/tRU3+zVX4ZX/ghlqdDipJpUc8vs5zEaHTTCdCZDE= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.73 Subject: [Qemu-devel] [PULL 6/6] 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 Crosthwaite , Riku Voipio , Laurent Vivier , Paolo Bonzini , Aurelien Jarno , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier Message-Id: <20180814161904.12216-4-laurent@vivier.eu> --- linux-user/syscall.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index da1fcaf4ca..424296d1a1 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, @@ -2315,6 +2329,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; @@ -2349,6 +2391,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); }