From patchwork Thu Mar 7 10:06:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1052765 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 44FRCj5DCzz9sB3 for ; Thu, 7 Mar 2019 21:08:17 +1100 (AEDT) Received: from localhost ([127.0.0.1]:48465 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pwl-0004Bc-IG for incoming@patchwork.ozlabs.org; Thu, 07 Mar 2019 05:08:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44050) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1pvs-00047E-B3 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1pvq-0007Vu-M8 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:19 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:37315) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1pvp-0007Ue-D7 for qemu-devel@nongnu.org; Thu, 07 Mar 2019 05:07:17 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MhDAi-1gXTGC2I5a-00eHyu; Thu, 07 Mar 2019 11:07:06 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 7 Mar 2019 11:06:56 +0100 Message-Id: <20190307100656.14044-10-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307100656.14044-1-laurent@vivier.eu> References: <20190307100656.14044-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:YIF2UCHRXKFxiPzqgHAN0xXmZY7BVdtpvH0t7XKmsEjmJ5BV5aI bTV9yU9GBqaHnfPhS9h+K0hSpwZE8RtIFpKVUzvsbxP3vDcRR79E2mr3JOQhBeRSmhQ0hEv 6WJwc30zNxXYRYnbplSxmCAfZOUksuNng510nsGjol5YxNXpJbhUSopLtW3Ef4XMby1dOWz Ezx3s0EFYgQQSfizF3HmQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:cZ2mU2yY9U4=:j61TZm4sFLJ4rYoTkyWfoY cVH+Nvt9+MJoWePJEToUHL4LDVgHwVd0h4ThyId9m4Ap/OINvsCwptYrm8fuI4yKGF3m80+f1 mqhLxlC3LcohXlzAlFDsuah6CtLDxCFTdD78qw5aY3dKH7S3vL4p/RezA0js/cJvVkB6EnBKl t/FM74+m8UnJxLC7jljH1igiQY1Pehcl5kns6wWEb+3ejDLfFK73DKnWqimiT03/8/+jBBRuz stgMDrKOywUaJ3hAzZHQ3bTHpSiXxq1u1WUea2T4kS0GQAEzGadFyf2y7yZU9z66y+kyBEIGF i1hC7xH2XryHxe7FfKvHKfty8XRg2xTbkBj7eC2OdTgeaNS/fF1wkktuIHUAt4u2BHaqUFrsi +hLVqO39rKnocYG+JU8ThpvJhsVf8gArzZu3HugVy0WaFJoDDsucLyqJM0gJCNOARmHSB40tb MrTxvjDvoRNu/71ZPBp29wCB7ufGZyFImMMH4j7HamTcChrsRC/UymXyR+FDsnCryLQnIaN1U BbAz96MV/YldZTHj4HxTbkzbPYqmYsdmz2CvThI6lUD62LwND1gftWp/Hsx0mXAfXUMo2qhEl Hz5VSiRKxPir7E1WsSlyXYMYNVMGnBk9mW6rNuIIUi38WgdiVzPCkGg9cv1mvOF6s6Yw1vU6i XOH9S68IZgH73sEiuVApeI8EYEd7W/NXI81e0STYQm2LZUhY/hpu4ku9bjMGI08hImdT0q5DY 1uWr4Sp7SjOJq/2TSOwPJ8IZwineCHMDWO2Dbfdbe3Vuwu8w9sYhqgtYk5U= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 9/9] 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 , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?b?w6k=?= , 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é Message-Id: <20190306200925.17605-1-laurent@vivier.eu> Signed-off-by: Laurent Vivier --- 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;