From patchwork Mon Aug 20 20:26:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 959966 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 41vQY211wLz9s4V for ; Tue, 21 Aug 2018 06:35:18 +1000 (AEST) Received: from localhost ([::1]:49172 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqtP-0000II-Jx for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2018 16:35:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51930) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1frqlb-00039a-EU for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:27:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1frqlL-0003J8-Qp for qemu-devel@nongnu.org; Mon, 20 Aug 2018 16:27:05 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:54646) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1frqlK-0003Do-N5 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 0MDHpc-1fdXwD2j2S-00Ga57; Mon, 20 Aug 2018 22:26:17 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 20 Aug 2018 22:26:03 +0200 Message-Id: <20180820202604.14218-7-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:2Dagc66lVC2pDcg7ZbJ8GLCYsGCLJvGzHvF0KtE65SVpuqnEEkm kRfKimThw7H7zJfrjl4CqZb6oGVzNS5H7VY4oXqZ6Ov11OokpCjDoBwtxF/TFgYHa/UHhRu ZOV+2h22nT0ycFVgfAKXZAYQcHjUAfsQYbhRfCD08TtuVx74NnzO0/U4McDqO2AM+nA0H7L 8NQdJxd+jNUp58R01CF6A== X-UI-Out-Filterresults: notjunk:1; V01:K0:HdVwdz2Q7Os=:K4k7y06gmhvLCiJVC7u8bZ bldyHRJNDlCifX2aikXyt1HG2gxPGwnzw/vms6p8DSpl2s1eUv37fEDGnrYM+byrYLppMtZva wBywidyyPxjvMbAXYiE7AO9uLSt1jpRiifuOLlfASYG+r7gbUCX0tTDjksUwx1cHDax3IUjDR +amqmmABgYmALjsQDrBKVOnsXw06xaIUh9JqQt+YiWgjmi5SCvPsWuupMZajJhxln0R233mFt J+ZD8H5dKYHxyRSim0R1L+UldKjZlA+xWQR9Qf9zapMBX3OKA2Tey+MmwTj9tG27PxL4DNOmz ThRqhAW4L6TV4XhksEH05jAp0KiWZNxJ6kMDvkVGPdR74oY+GC2CFsDC1Hgumvepm75V/YGYd 4siZ+fdiznNhr5RNmOT6xjtAYcRncoey7X4Q7aUqZuGCQjv7qmkaoU/SOHTvK7zBQLSBxboHw CmKY5FpPkyvxwLbXEjKTEtGm8MdbWGl8mIlQOo2to5zJ5bsRJfd5MDSB2x2kVsWbL9HQtCT5m Hopkn9rrv5lBgdenB0nD2JvlNw/PyGPsH/Ais2rNuZ+g05miPJ5+s5WvbC04u6wqT2O1vcfMh wKpYHBOigvj0s+ceg7cNgSFLpbMtnosEZ6/HQHR9vcxdoC47xynhcdnF6oq74qHESOdUk/Plg 85aHpEIJ+PyjPu7Sm+qNhXTy7Dbmy1Bk7pJwsvg/pMTHoqc1uCtKtbyGJBSjo4LmiZJ0= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.126.135 Subject: [Qemu-devel] [PULL 6/7] linux-user: update netlink route 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: 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" Add RTA_PREF and RTA_CACHEINFO. Fix following errors when we start gedit: Unknown host RTA type: 12 Unknown host RTA type: 20 Signed-off-by: Laurent Vivier Reviewed-by: Peter Maydell Message-Id: <20180820171557.7734-4-laurent@vivier.eu> --- linux-user/syscall.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9effbb316a..c0840107c9 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -2693,12 +2693,17 @@ static abi_long host_to_target_data_addr_rtattr(struct rtattr *rtattr) static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) { uint32_t *u32; + struct rta_cacheinfo *ci; + switch (rtattr->rta_type) { /* binary: depends on family type */ case QEMU_RTA_GATEWAY: case QEMU_RTA_DST: case QEMU_RTA_PREFSRC: break; + /* u8 */ + case QEMU_RTA_PREF: + break; /* u32 */ case QEMU_RTA_PRIORITY: case QEMU_RTA_TABLE: @@ -2706,6 +2711,20 @@ static abi_long host_to_target_data_route_rtattr(struct rtattr *rtattr) u32 = RTA_DATA(rtattr); *u32 = tswap32(*u32); break; + /* struct rta_cacheinfo */ + case QEMU_RTA_CACHEINFO: + ci = RTA_DATA(rtattr); + ci->rta_clntref = tswap32(ci->rta_clntref); + ci->rta_lastuse = tswap32(ci->rta_lastuse); + ci->rta_expires = tswap32(ci->rta_expires); + ci->rta_error = tswap32(ci->rta_error); + ci->rta_used = tswap32(ci->rta_used); +#if defined(RTNETLINK_HAVE_PEERINFO) + ci->rta_id = tswap32(ci->rta_id); + ci->rta_ts = tswap32(ci->rta_ts); + ci->rta_tsage = tswap32(ci->rta_tsage); +#endif + break; default: gemu_log("Unknown host RTA type: %d\n", rtattr->rta_type); break;