From patchwork Wed Aug 17 13:49:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Privoznik X-Patchwork-Id: 9285993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4708960574 for ; Wed, 17 Aug 2016 13:50:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3566C298AB for ; Wed, 17 Aug 2016 13:50:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2A135298B7; Wed, 17 Aug 2016 13:50:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BFD78298AB for ; Wed, 17 Aug 2016 13:50:15 +0000 (UTC) Received: from localhost ([::1]:47620 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba1EU-0000Lm-Ej for patchwork-qemu-devel@patchwork.kernel.org; Wed, 17 Aug 2016 09:50:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba1Dv-0000Js-FS for qemu-devel@nongnu.org; Wed, 17 Aug 2016 09:49:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ba1Do-0006gl-DJ for qemu-devel@nongnu.org; Wed, 17 Aug 2016 09:49:38 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49978) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ba1Do-0006gg-4U for qemu-devel@nongnu.org; Wed, 17 Aug 2016 09:49:32 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 89D007DD04; Wed, 17 Aug 2016 13:49:31 +0000 (UTC) Received: from lisa.redhat.com (vpn-229-198.phx2.redhat.com [10.3.229.198]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7HDnSgV013571; Wed, 17 Aug 2016 09:49:30 -0400 From: Michal Privoznik To: qemu-devel@nongnu.org Date: Wed, 17 Aug 2016 15:49:23 +0200 Message-Id: <63a7b70d7f2a95e6bb8b42d9f496067cd0d8d75f.1471441656.git.mprivozn@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 17 Aug 2016 13:49:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] Revert "syscall.c: Fix build with older linux-headers" 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@linaro.org, laurent@vivier.eu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The fix I've made there was wrong. I mean, basically what I did there was equivalent to: #if 0 some code; #endif This reverts commit 9c37146782e7850877d452da47dc451ba73aa62d. Signed-off-by: Michal Privoznik Reviewed-by: Laurent Vivier --- linux-user/syscall.c | 86 ---------------------------------------------------- 1 file changed, 86 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 9facf7c..7425968 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1783,58 +1783,30 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, uint64_t *u64; switch (nlattr->nla_type) { -#ifdef IFLA_BR_FDB_FLUSH /* no data */ case IFLA_BR_FDB_FLUSH: break; -#endif -#ifdef IFLA_BR_GROUP_ADDR /* binary */ case IFLA_BR_GROUP_ADDR: break; -#endif /* uint8_t */ case IFLA_BR_VLAN_FILTERING: -#ifdef IFLA_BR_TOPOLOGY_CHANGE case IFLA_BR_TOPOLOGY_CHANGE: -#endif -#ifdef IFLA_BR_TOPOLOGY_CHANGE_DETECTED case IFLA_BR_TOPOLOGY_CHANGE_DETECTED: -#endif -#ifdef IFLA_BR_MCAST_ROUTER case IFLA_BR_MCAST_ROUTER: -#endif -#ifdef IFLA_BR_MCAST_SNOOPING case IFLA_BR_MCAST_SNOOPING: -#endif -#ifdef IFLA_BR_MCAST_QUERY_USE_IFADDR case IFLA_BR_MCAST_QUERY_USE_IFADDR: -#endif -#ifdef IFLA_BR_MCAST_QUERIER case IFLA_BR_MCAST_QUERIER: -#endif -#ifdef IFLA_BR_NF_CALL_IPTABLES case IFLA_BR_NF_CALL_IPTABLES: -#endif -#ifdef IFLA_BR_NF_CALL_IP6TABLES case IFLA_BR_NF_CALL_IP6TABLES: -#endif -#ifdef IFLA_BR_NF_CALL_ARPTABLES case IFLA_BR_NF_CALL_ARPTABLES: -#endif break; /* uint16_t */ case IFLA_BR_PRIORITY: case IFLA_BR_VLAN_PROTOCOL: -#ifdef IFLA_BR_GROUP_FWD_MASK case IFLA_BR_GROUP_FWD_MASK: -#endif -#ifdef IFLA_BR_ROOT_PORT case IFLA_BR_ROOT_PORT: -#endif -#ifdef IFLA_BR_VLAN_DEFAULT_PVID case IFLA_BR_VLAN_DEFAULT_PVID: -#endif u16 = NLA_DATA(nlattr); *u16 = tswap16(*u16); break; @@ -1844,65 +1816,31 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, case IFLA_BR_MAX_AGE: case IFLA_BR_AGEING_TIME: case IFLA_BR_STP_STATE: -#ifdef IFLA_BR_ROOT_PATH_COST case IFLA_BR_ROOT_PATH_COST: -#endif -#ifdef IFLA_BR_MCAST_HASH_ELASTICITY case IFLA_BR_MCAST_HASH_ELASTICITY: -#endif -#ifdef IFLA_BR_MCAST_HASH_MAX case IFLA_BR_MCAST_HASH_MAX: -#endif -#ifdef IFLA_BR_MCAST_LAST_MEMBER_CNT case IFLA_BR_MCAST_LAST_MEMBER_CNT: -#endif -#ifdef IFLA_BR_MCAST_STARTUP_QUERY_CNT case IFLA_BR_MCAST_STARTUP_QUERY_CNT: -#endif u32 = NLA_DATA(nlattr); *u32 = tswap32(*u32); break; /* uint64_t */ -#ifdef IFLA_BR_HELLO_TIMER case IFLA_BR_HELLO_TIMER: -#endif -#ifdef IFLA_BR_TCN_TIMER case IFLA_BR_TCN_TIMER: -#endif -#ifdef IFLA_BR_GC_TIMER case IFLA_BR_GC_TIMER: -#endif -#ifdef IFLA_BR_TOPOLOGY_CHANGE_TIMER case IFLA_BR_TOPOLOGY_CHANGE_TIMER: -#endif -#ifdef IFLA_BR_MCAST_LAST_MEMBER_INTVL case IFLA_BR_MCAST_LAST_MEMBER_INTVL: -#endif -#ifdef IFLA_BR_MCAST_MEMBERSHIP_INTVL case IFLA_BR_MCAST_MEMBERSHIP_INTVL: -#endif -#ifdef IFLA_BR_MCAST_QUERIER_INTVL case IFLA_BR_MCAST_QUERIER_INTVL: -#endif -#ifdef IFLA_BR_MCAST_QUERY_INTVL case IFLA_BR_MCAST_QUERY_INTVL: -#endif -#ifdef IFLA_BR_MCAST_QUERY_RESPONSE_INTVL case IFLA_BR_MCAST_QUERY_RESPONSE_INTVL: -#endif -#ifdef IFLA_BR_MCAST_STARTUP_QUERY_INTVL case IFLA_BR_MCAST_STARTUP_QUERY_INTVL: -#endif u64 = NLA_DATA(nlattr); *u64 = tswap64(*u64); break; /* ifla_bridge_id: uin8_t[] */ -#ifdef IFLA_BR_ROOT_ID case IFLA_BR_ROOT_ID: -#endif -#ifdef IFLA_BR_BRIDGE_ID case IFLA_BR_BRIDGE_ID: -#endif break; default: gemu_log("Unknown IFLA_BR type %d\n", nlattr->nla_type); @@ -1930,30 +1868,16 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, case IFLA_BRPORT_PROXYARP: case IFLA_BRPORT_LEARNING_SYNC: case IFLA_BRPORT_PROXYARP_WIFI: -#ifdef IFLA_BRPORT_TOPOLOGY_CHANGE_ACK case IFLA_BRPORT_TOPOLOGY_CHANGE_ACK: -#endif -#ifdef IFLA_BRPORT_CONFIG_PENDING case IFLA_BRPORT_CONFIG_PENDING: -#endif -#ifdef IFLA_BRPORT_MULTICAST_ROUTER case IFLA_BRPORT_MULTICAST_ROUTER: -#endif break; /* uint16_t */ case IFLA_BRPORT_PRIORITY: -#ifdef IFLA_BRPORT_DESIGNATED_PORT case IFLA_BRPORT_DESIGNATED_PORT: -#endif -#ifdef IFLA_BRPORT_DESIGNATED_COST case IFLA_BRPORT_DESIGNATED_COST: -#endif -#ifdef IFLA_BRPORT_ID case IFLA_BRPORT_ID: -#endif -#ifdef IFLA_BRPORT_NO case IFLA_BRPORT_NO: -#endif u16 = NLA_DATA(nlattr); *u16 = tswap16(*u16); break; @@ -1963,25 +1887,15 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, *u32 = tswap32(*u32); break; /* uint64_t */ -#ifdef IFLA_BRPORT_MESSAGE_AGE_TIMER case IFLA_BRPORT_MESSAGE_AGE_TIMER: -#endif -#ifdef IFLA_BRPORT_FORWARD_DELAY_TIMER case IFLA_BRPORT_FORWARD_DELAY_TIMER: -#endif -#ifdef IFLA_BRPORT_HOLD_TIMER case IFLA_BRPORT_HOLD_TIMER: -#endif u64 = NLA_DATA(nlattr); *u64 = tswap64(*u64); break; /* ifla_bridge_id: uint8_t[] */ -#ifdef IFLA_BRPORT_ROOT_ID case IFLA_BRPORT_ROOT_ID: -#endif -#ifdef IFLA_BRPORT_BRIDGE_ID case IFLA_BRPORT_BRIDGE_ID: -#endif break; default: gemu_log("Unknown IFLA_BRPORT type %d\n", nlattr->nla_type);