From patchwork Mon Aug 20 20:26:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959978 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 41vQly5r1pz9s4c for ; Tue, 21 Aug 2018 06:44:46 +1000 (AEST) Received: from localhost ([::1]:49232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frr2a-0003ok-Dg for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 16:44:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqlY-00037Q-P4 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:27:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqlL-0003Iy-M9 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:26:59 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:42857) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frqlK-0003EI-JS for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:26:55 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.167]) with ESMTPSA (Nemesis) id 0MClSU-1fiSok44sU-009RD9; Mon, 20 Aug 2018 22:26:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 22:26:02 +0200 Message-Id: <20180820202604.14218-6-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:zgjIT0C+tyUwnsjij74NRdA/oRr81X0K6PJQzV29wkaXGIbP0Bd KxxkvFkbnAhoVvXPtxmnq/USiCGrsFH+1/kA+B0mrtHXuPJ3lytYBPyuu5utegx8GDMqdt+ vCg8nrgA6L9LacplLgb6g170Mv6fSEH0scFWkK4iFi3n10318KQCaZr6xocAyYlNzHdNbhq nuBISZzvDycUFVZZM52wA== X-UI-Out-Filterresults: notjunk:1; V01:K0:HNWgfK4eCes=:yZPj713F+aBZeNGAb+egiV swiu6Zpu/IWf4KYbldGIwY2U//mTINXMiOmjH0uQcBmMcFQbeM20XzkpSxczFI2qLww5AJ/6p aQPZAS2H2GbL8L7BxpJfNvAIFYIypPlF+fGZj4NQ5ymW39ce8vAefY6QI2wcdBMcEE4MH0QOy D4xX1j4XRn9Mcn/h2RWktbJlFJ5e3HaN5tjp0AjNdC+sY/3GGIBQnNNh5Jbnkh8BWQUJTZdWW rT5G8nXBSaf8BGQrLed6EzDpsXweeyRxpD70GNlCoB7z2xnLQrQlDoSchaYp3BEwM8dLQgg8Z UHPWLHPgsowQ8rGxRr96XGQUv07aEqDcLr7MY8r029C0iM8Xyraog8oR6EFzqJ4EUCHnWIFJB NImhHcjNMZ6lf6fNBWWB3RnbTdJ83aDrWSxQJJen2H6iRUjMOrCAuXUSSUhjJmiBdUzXSDhHQ U2gJSw5vSO3/AcRWao9E7dxr5pofdS8GpEzPxjcAjgWjA31h5rRYxWAzg8nY6uEXao1PbzAbH ey5eoxHx9vWfncbIxe6fUthzXNynzZw7SXtiH6qv7fecJ6pWRWUm+PM2ObDOMZIXJP0Mv/raz RF3Hv2nIX3J+VONj4reB6bpRXB3ZOl6+LcFFuyFnVcMfe77dMaIeqThXaQaxMWz/WUn7/nZzL F/VzN8z23P1VidyJAvRcOQd+sAYpc9Wt/WouEFy/B6STJJUhSjntLoqa2Tmk+D/CxLKE= 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 5/7] linux-user: introduce QEMU_RTA_* to use with rtattr_type_t 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" Following commit will introduce RTA_PREF that appears only with kernel v4.1. To avoid to manage a specific case for it, this patch introduces the full list of rtattr_type_t prefixed with QEMU_ (as we did for IFLA values) Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Message-Id: <20180820171557.7734-3-laurent@vivier.eu> [lv: added more RTA_* from linux v4.18] --- linux-user/syscall.c | 56 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index e66faf1c62..9effbb316a 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -539,6 +539,40 @@ enum { QEMU___IFLA_XDP_MAX, }; +enum { + QEMU_RTA_UNSPEC, + QEMU_RTA_DST, + QEMU_RTA_SRC, + QEMU_RTA_IIF, + QEMU_RTA_OIF, + QEMU_RTA_GATEWAY, + QEMU_RTA_PRIORITY, + QEMU_RTA_PREFSRC, + QEMU_RTA_METRICS, + QEMU_RTA_MULTIPATH, + QEMU_RTA_PROTOINFO, /* no longer used */ + QEMU_RTA_FLOW, + QEMU_RTA_CACHEINFO, + QEMU_RTA_SESSION, /* no longer used */ + QEMU_RTA_MP_ALGO, /* no longer used */ + QEMU_RTA_TABLE, + QEMU_RTA_MARK, + QEMU_RTA_MFC_STATS, + QEMU_RTA_VIA, + QEMU_RTA_NEWDST, + QEMU_RTA_PREF, + QEMU_RTA_ENCAP_TYPE, + QEMU_RTA_ENCAP, + QEMU_RTA_EXPIRES, + QEMU_RTA_PAD, + QEMU_RTA_UID, + QEMU_RTA_TTL_PROPAGATE, + QEMU_RTA_IP_PROTO, + QEMU_RTA_SPORT, + QEMU_RTA_DPORT, + QEMU___RTA_MAX +}; + typedef abi_long (*TargetFdDataFunc)(void *, size_t); typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t); typedef struct TargetFdTrans { @@ -2661,14 +2695,14 @@ static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) uint32_t *u32; switch (rtattr->rta_type) { /* binary: depends on family type */ - case RTA_GATEWAY: - case RTA_DST: - case RTA_PREFSRC: + case QEMU_RTA_GATEWAY: + case QEMU_RTA_DST: + case QEMU_RTA_PREFSRC: break; /* u32 */ - case RTA_PRIORITY: - case RTA_TABLE: - case RTA_OIF: + case QEMU_RTA_PRIORITY: + case QEMU_RTA_TABLE: + case QEMU_RTA_OIF: u32 = RTA_DATA(rtattr); *u32 = tswap32(*u32); break; @@ -2808,13 +2842,13 @@ static abi_long target_to_host_data_route_rtattr(struct rtattr *rtattr) uint32_t *u32; switch (rtattr->rta_type) { /* binary: depends on family type */ - case RTA_DST: - case RTA_SRC: - case RTA_GATEWAY: + case QEMU_RTA_DST: + case QEMU_RTA_SRC: + case QEMU_RTA_GATEWAY: break; /* u32 */ - case RTA_PRIORITY: - case RTA_OIF: + case QEMU_RTA_PRIORITY: + case QEMU_RTA_OIF: u32 = RTA_DATA(rtattr); *u32 = tswap32(*u32); break;