From patchwork Tue Aug 14 16:19:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 957605 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 41qg2k4cW0z9ryt for ; Wed, 15 Aug 2018 03:44:29 +1000 (AEST) Received: from localhost ([::1]:45314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpdMp-0004E6-4O for incoming@patchwork.ozlabs.org; Tue, 14 Aug 2018 13:44:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpdCf-0004fu-NB for qemu-devel@nongnu.org; Tue, 14 Aug 2018 13:34:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpdCH-00036D-FB for qemu-devel@nongnu.org; Tue, 14 Aug 2018 13:33:57 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:43001) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fpdCH-00035c-4a for qemu-devel@nongnu.org; Tue, 14 Aug 2018 13:33:33 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue101 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MQNoq-1fSd5m1Ns4-00Tp6k; Tue, 14 Aug 2018 18:19:10 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 14 Aug 2018 18:19:04 +0200 Message-Id: <20180814161904.12216-4-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180814161904.12216-1-laurent@vivier.eu> References: <20180814161904.12216-1-laurent@vivier.eu> X-Provags-ID: V03:K1:vcuenbg+LvOoE3BcQPBo0s26TnZc9LcAVu854wNBJJXWk45qR0h S+qB12hXr1aOZdsR1EpYIulruWDojLpbCGNbzFMOLYO3jRlqyyl+ryz2fEW0Duf1xkTYeDZ JA9YSpH6mZj8GFTd4A/IEickPfokc6xD4bSvwbbrhuCOL6mAmltW64FOthqABb8yqoQBEVe buukTjosG73f3mS2X2LaA== X-UI-Out-Filterresults: notjunk:1; V01:K0:CYLrtcsGeNk=:b94BcULCSNv7Pi51eo26rG pd772Os3ldojwmEiQLlN+ZgLtodf4zKcnVugY15kxJf4IQDAcIK4Z+oyrWZVVG5q7SQvsvOn/ ZJiQS75IWC0UQC9NuNU/UqA1EEPYzQALUkf4oMy5R7+nFOWE1q0lyuZs4f1i+/iBiB/6tszZ/ GHbBph7sQhjt8gJFM4Ct9+YELmHXJ/4n/21ySjIwltXcuZ0PLMzcBVWCa68WlUBgfaV/q/Rms lNXDyUdcaqBpdbxUuv9XzQpPYE/sojzod9HRgrYeWXNNleqcjMKp/y4az5e9muA3WoFvPaIuZ YQDdb/oLyf1xWBffVqr9kix9aSBxlEaf/tZnEjbDqj35uscLgbtOv0+3VC55l5C6HWH/+TCR4 ZiRoT+lCKRBQppPFcGOIBgXSH0ATMvgp7EQQ9BAl9vbqCqSCPc8UFX0XJX/1N2eTbAVYncqrh kBNRSfqsYOzX3TTZmuGukFv4YBQTSWpKG323GC/WTlj55yUYcfCkdi9oQbdpiAiFV/1bqtpf4 JDMIVXK2ANLtPyg0rSOZ9ThzNpZ6GUdn+7ugDqr7JtBMDjl+X1EhbkDqPOVjdO1cjZldTj3Yu Cdh8LtqHCPWPCwiT2hJ5JIFpll1BAAfQgPZ4h4aE9HI8KggLKqM7EdISA14A35C5cx3GG+0wP J3U1/tloTc7GDglsKmLqRY3KQITbeo3ctGMMDIb56s14+8Jo2cGuMgJ1EuZd7eySp5VU= 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] [PATCH 3/3] 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: Riku Voipio , Laurent Vivier Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Laurent Vivier --- linux-user/syscall.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index fe12ac4849..210c236af9 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); }