From patchwork Wed Mar 6 20:09:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1052505 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=209.51.188.17; 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 [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44F4cw1kjvz9ryj for ; Thu, 7 Mar 2019 07:10:22 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1crr-0005eo-6k for incoming@patchwork.ozlabs.org; Wed, 06 Mar 2019 15:10:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1crQ-0005dy-F0 for qemu-devel@nongnu.org; Wed, 06 Mar 2019 15:09:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1crM-0004Y0-Hz for qemu-devel@nongnu.org; Wed, 06 Mar 2019 15:09:52 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:36855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1crM-0004V2-8l for qemu-devel@nongnu.org; Wed, 06 Mar 2019 15:09:48 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N6KML-1gzshj3yH3-016jel; Wed, 06 Mar 2019 21:09:35 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 6 Mar 2019 21:09:25 +0100 Message-Id: <20190306200925.17605-1-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:+u4LnP9Kuy6YRod11cpYKkTo8FT+J7Gj8BBHy99XMaBYrb0IKdS HVdi1+evdMM31iaO0grPL3BhH10ls9H/9bqf4KNOTEtSp9HW6Mq+WLcv5j21H8uai/2Ni7b ASRw+9x3IguyOru8PC8x/q3Q/hobgNkmboqA6AzzHaXrYISxDG+vo49suwlMYJtX6Ukiudr yuSSKXfP4dloti3HrFSkg== X-UI-Out-Filterresults: notjunk:1; V03:K0:+Nl+QPKOjRc=:Ec79Qn3F8EcNFeLKJX41rF 2vIAsUcAdqEUgJiRRc4mwq9Bk2YLc3yoGleskcM+6JuhzlsTGREXH3cFzj7kiFy5GnBqF2EiL PcmGWfM3rJi8qUh+9OVwnBLYdJeNW/u5mMen8KwKZPmfX6i8tlewhn4XrrBZjhjEKY+5ACf65 l7YQzsqlQLGRNON5I2cN3/OkGC3qP/RFGrmYoByyb9WimnOCHYO3dw3D2EkNNFiQ9/QK/aRjc vrx7TweP/1OaUVnjCgNrlE0CK/MODXIihSfkUGo5IkeG/5GRA526PIDwU/Xkb8k/AoGdSTJOp XU1gV1SwtwgoLLNEiyO82RlLMhIfPvBKr8qYsgvPsdBRAOFnoP3bdOKyB6TWwgdb8CyCpQXb1 ZGKpllxIug54ghND+6gyAljwuR1xTDaF9RCPw4jhh2oq1sZ7+E9y/4Qc4fAGQVIi3dCWjCbFs wGPiguiOED2TH4EMPXHjbXv8CD9Dl8E4AdlAfkSeCViHp010TVu+PHC9KnmN813MhndqSNKAY LooRNKnTpml39Pi0zyBUD6/dbCfgcS2fbCCDIeX0LDYFWUBc4lMt8Nj4dSxIi1WY6A0Vh+dgL J1hGx8PrMOajaMSDiRWxk1wW1pcZTqTf23kOBLw5hGBwU+QSkt34Md5TMaw7v31WlLgyOhTD6 4/fGuipPGFc60bAs+92jp67WJxnhKE9EknA/z34pnk5X2j6545mEYYn38oXwGKcjluCJXim6b 5UV0OmGGO1uIhjo6hj+moMh2RfCGQbS6rI1nIw== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.131 Subject: [Qemu-devel] [PATCH] linux-user: add new netlink types 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" Add QEMU_IFLA_BR_VLAN_STATS_PER_PORT (from linux v4.20), QEMU_IFLA_BR_MULTI_BOOLOPT (from linux v5.0). The first new entry fixes the following error: Unknown QEMU_IFLA_BR type 45 Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé --- linux-user/fd-trans.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c index 30425c9df6bc..612819c1b1ec 100644 --- a/linux-user/fd-trans.c +++ b/linux-user/fd-trans.c @@ -75,6 +75,8 @@ enum { QEMU_IFLA_BR_MCAST_STATS_ENABLED, QEMU_IFLA_BR_MCAST_IGMP_VERSION, QEMU_IFLA_BR_MCAST_MLD_VERSION, + QEMU_IFLA_BR_VLAN_STATS_PER_PORT, + QEMU_IFLA_BR_MULTI_BOOLOPT, QEMU___IFLA_BR_MAX, }; @@ -438,6 +440,7 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, case QEMU_IFLA_BR_MCAST_STATS_ENABLED: case QEMU_IFLA_BR_MCAST_IGMP_VERSION: case QEMU_IFLA_BR_MCAST_MLD_VERSION: + case QEMU_IFLA_BR_VLAN_STATS_PER_PORT: break; /* uint16_t */ case QEMU_IFLA_BR_PRIORITY: @@ -543,6 +546,12 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, case QEMU_IFLA_BRPORT_ROOT_ID: case QEMU_IFLA_BRPORT_BRIDGE_ID: break; + /* br_boolopt_multi { uint32_t, uint32_t } */ + case QEMU_IFLA_BR_MULTI_BOOLOPT: + u32 = NLA_DATA(nlattr); + u32[0] = tswap32(u32[0]); /* optval */ + u32[1] = tswap32(u32[1]); /* optmask */ + break; default: gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type); break;