From patchwork Mon Aug 20 20:26: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: 959973 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 41vQfD2HhJz9s78 for ; Tue, 21 Aug 2018 06:39:48 +1000 (AEST) Received: from localhost ([::1]:49201 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqxl-0003tr-Uk for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 16:39:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqlM-0002x6-2U for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:26:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqlF-00032E-EH for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:26:55 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:46756) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frqlC-0002og-OG for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:26:47 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MBezu-1fjZHQ1SVy-00AXfr; Mon, 20 Aug 2018 22:26:18 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 22:26:04 +0200 Message-Id: <20180820202604.14218-8-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180820202604.14218-1-laurent@vivier.eu> References: <20180820202604.14218-1-laurent@vivier.eu> X-Provags-ID: V03:K1:bIxifVFtYoP5V7+vG9nnBbF3JmAhIF1jNFtbGFxnUNBPj8Qo+IB vQm2IdNEGhgUatWYLuUGqQDmTq7tYOXismxD/Q3UcVcJyg6l2o58TLEwAgYwr9lOe+9Fqmm tQea4/lf3oeoMhQcukug6MrxprFaUVdT6ksFPRcBI38Qf9d8NTIlWJqdpHSpDuat/7xJRDh zN5XKb1KyeUo6iNEk9a7g== X-UI-Out-Filterresults: notjunk:1; V01:K0:JizmEGzGSA8=:u+GtIr0lup2zdFTYfG0+ZJ bsl8pMztvF1rG0lm+92DrJzsQ52OuKi1hRr2Tehw5iMSmbdMFEMpi59GzX6eFBXZ5PydEb8WK 9JGMF7elxqB51wXI8/MXThV4K3LfKueoCH3tZDS2gRQXSqzYMJp1O7KhowrEfdWTM/0BCq4v/ DYEXBcMunCkMak7EEceAopi2izgOTClHxITCxDLuxiWqu8IACAO7Z5v55dTsPOpKGpHSyseYp wGg8bNMRxaaCYIVD1lEAEfrdOcOSkfmRfTN/b7UOeSGtQqwOB/mp5dUtc6WUMvmQRTz9s7c1q UPNgP4DYvves+DkyxDwNHPE4yivQx00moXOurieQczcII7TTEpA7JEd47W16GI0enIjmPnNNN Dl5OWd+l/EJPeIcyEDt29DJxBUFBs7GjxVkhw4BlhZ6VWLDPXJhfFexE2GaaqoE+u/lkcdcVK qLQdCxBftcYrtnqckWy9lCBEgyzDl1HoOBqmaGX4ZWQrWGTW1BkH1pyUO/xxh/SUMV4av2CD/ zYIJVR+/LE+OdF/XugTeu1wVxPLl2gK7MOSFgkkrtOJdtkYTWkkedNQmNMB2Mev22Bp48sIxa +GnspGVR73GbjRUiWuCAB2BGZCjJ1lF65/SmPAQYdf7uvqbUL86md15XPAXxofOwAr48OYzo3 eFFhMQPxm/59uoTzxgpAvwzDIRHmVAjQeuxHPUBlZq19fVHy0/i4C+5iPhYSpTkYfeu0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.130 Subject: [Qemu-devel] [PULL 7/7] 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 Reviewed-by: Peter Maydell Message-Id: <20180820171557.7734-5-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 c0840107c9..202aa777ad 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, @@ -2349,6 +2363,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; @@ -2383,6 +2425,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); }