From patchwork Mon Aug 20 17:15:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959843 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 41vL8L4w7Cz9s4v for ; Tue, 21 Aug 2018 03:17:06 +1000 (AEST) Received: from localhost ([::1]:48266 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frnnc-0007DK-6y for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 13:17:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49084) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frnn0-0007Bd-88 for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frnmv-0003CG-9q for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:26 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:36414) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frnmu-0003Ba-UT for qemu-devel@nongnu.org; Mon, 20 Aug 2018 13:16:21 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.167]) with ESMTPSA (Nemesis) id 0Lb6pZ-1gG6zK0IDx-00kbnS; Mon, 20 Aug 2018 19:16:11 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 19:15:55 +0200 Message-Id: <20180820171557.7734-3-laurent@vivier.eu> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180820171557.7734-1-laurent@vivier.eu> References: <20180820171557.7734-1-laurent@vivier.eu> X-Provags-ID: V03:K1:tmMUSD512yo8rHMYZCG/ivVWo28wLW23azNVmhZiNqaf4rOD6yZ lfQM19d18D3+Tnqn3BOSAu4+VLu8FmnojxA6vGuTScWtd68sXDOvGdZJh/aFiXFjfu+WSAx dWhNuELrJgWXBiyjgCvPeklu5f1NKIgnOpivO/5kmTINQ9OqRzuuXgvvy0s3/AZUK4liFIQ sNa2urGky7W1p8nkg47uQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:E9wlU9AWawQ=:uSki1evcEi29DpwfV1g0mt L6OzHF7NnP9crGtuYsbJf59LZcnYeC7zQtEvTvbRcROX5OYEzgKCnE4lAOZcCx6I7N3/N5K2b N4vrwLgKHQLUtg5qR53VEk1eLLMllsvk/YWphjH+XKUUud08v6tPNxOx4ckdFRLwMukDnrPvS i3e4QbzmiC2z2EDHGTYWJKTLqXtzBy+TuudoMbcsuB1u6DQZwFuzK2iw3EBRF4EYfWPRJ+TJs 2hqwzhtHtgzuf2hMT3k+akJV/EXCUCoW8tBurPPyklICorh5IG3BDDeUbQu8YkhHbm0LVnGcO DbVgb8MVUhpYx6xxRSCQ7ofq/V3HPh3ifRC9ciF9y/vJvwUuc/fer7XyvHAdFK2/uUErBHVUD N3c3xrkGZlTwKKTR+nzJUdyn+Cz8Ie4L74PZuiVNDE1HMKEmwNk01IMm3jQ4v+KJ9YW1XwaRs jv9KxoBNegO6olYWyotTuQFc6k02mWYc8ch1M8m6QHC0WtPGwif87QSkqPOb0Pdjy0+MPOIr+ bG8DQvDIo48WtaTpgMouAOH6UQkAvsbcGpjnqA770sRgB+HMasOSkPBURb4opmUkT5pjyN5dM BHPQ/aGyCE3mKKaVhJRJWWJvHuNaQ2A4fnphSxc3GkTk6Sx5gYqATmV1LUI1oLfLTaxaYgo8c Mfmux0WDfUHmdDq6NVFWK5fnvytId6twqPhPwEN1/sS7MnioTqSKkzWvWYt+2kX5JtoQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.134 Subject: [Qemu-devel] [PATCH v2 2/4] 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 Maydell , Riku Voipio , Laurent Vivier 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 --- linux-user/syscall.c | 53 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index a62cd15dc7..a2395eb1b6 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -539,6 +539,37 @@ 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_MAX +}; + typedef abi_long (*TargetFdDataFunc)(void *, size_t); typedef abi_long (*TargetFdAddrFunc)(void *, abi_ulong, socklen_t); typedef struct TargetFdTrans { @@ -2661,14 +2692,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 +2839,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;