david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "syscall.c: Fix build with older linux-headers"

Browse Source 
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 <mprivozn@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-id: 40d61349e445c1ad5fef795da704bf7ed6e19c86.1471593869.git.mprivozn@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Michal Privoznik 2016-08-19 10:06:39 +02:00 committed by Peter Maydell
parent 02b1ad881c
commit aee5f8f98e
1 changed files with 0 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
linux-user/syscall.c
View File

@ -1783,58 +1783,30 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr,
uint64_t *u64; uint64_t *u64;
switch (nlattr->nla_type) { switch (nlattr->nla_type) {
#ifdef IFLA_BR_FDB_FLUSH
/* no data */ /* no data */
case IFLA_BR_FDB_FLUSH: case IFLA_BR_FDB_FLUSH:
break; break;
#endif
#ifdef IFLA_BR_GROUP_ADDR
/* binary */ /* binary */
case IFLA_BR_GROUP_ADDR: case IFLA_BR_GROUP_ADDR:
break; break;
#endif
/* uint8_t */ /* uint8_t */
case IFLA_BR_VLAN_FILTERING: case IFLA_BR_VLAN_FILTERING:
#ifdef IFLA_BR_TOPOLOGY_CHANGE
case IFLA_BR_TOPOLOGY_CHANGE: case IFLA_BR_TOPOLOGY_CHANGE:
#endif
#ifdef IFLA_BR_TOPOLOGY_CHANGE_DETECTED
case IFLA_BR_TOPOLOGY_CHANGE_DETECTED: case IFLA_BR_TOPOLOGY_CHANGE_DETECTED:
#endif
#ifdef IFLA_BR_MCAST_ROUTER
case IFLA_BR_MCAST_ROUTER: case IFLA_BR_MCAST_ROUTER:
#endif
#ifdef IFLA_BR_MCAST_SNOOPING
case IFLA_BR_MCAST_SNOOPING: case IFLA_BR_MCAST_SNOOPING:
#endif
#ifdef IFLA_BR_MCAST_QUERY_USE_IFADDR
case IFLA_BR_MCAST_QUERY_USE_IFADDR: case IFLA_BR_MCAST_QUERY_USE_IFADDR:
#endif
#ifdef IFLA_BR_MCAST_QUERIER
case IFLA_BR_MCAST_QUERIER: case IFLA_BR_MCAST_QUERIER:
#endif
#ifdef IFLA_BR_NF_CALL_IPTABLES
case IFLA_BR_NF_CALL_IPTABLES: case IFLA_BR_NF_CALL_IPTABLES:
#endif
#ifdef IFLA_BR_NF_CALL_IP6TABLES
case IFLA_BR_NF_CALL_IP6TABLES: case IFLA_BR_NF_CALL_IP6TABLES:
#endif
#ifdef IFLA_BR_NF_CALL_ARPTABLES
case IFLA_BR_NF_CALL_ARPTABLES: case IFLA_BR_NF_CALL_ARPTABLES:
#endif
break; break;
/* uint16_t */ /* uint16_t */
case IFLA_BR_PRIORITY: case IFLA_BR_PRIORITY:
case IFLA_BR_VLAN_PROTOCOL: case IFLA_BR_VLAN_PROTOCOL:
#ifdef IFLA_BR_GROUP_FWD_MASK
case IFLA_BR_GROUP_FWD_MASK: case IFLA_BR_GROUP_FWD_MASK:
#endif
#ifdef IFLA_BR_ROOT_PORT
case IFLA_BR_ROOT_PORT: case IFLA_BR_ROOT_PORT:
#endif
#ifdef IFLA_BR_VLAN_DEFAULT_PVID
case IFLA_BR_VLAN_DEFAULT_PVID: case IFLA_BR_VLAN_DEFAULT_PVID:
#endif
u16 = NLA_DATA(nlattr); u16 = NLA_DATA(nlattr);
*u16 = tswap16(*u16); *u16 = tswap16(*u16);
break; 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_MAX_AGE:
case IFLA_BR_AGEING_TIME: case IFLA_BR_AGEING_TIME:
case IFLA_BR_STP_STATE: case IFLA_BR_STP_STATE:
#ifdef IFLA_BR_ROOT_PATH_COST
case IFLA_BR_ROOT_PATH_COST: case IFLA_BR_ROOT_PATH_COST:
#endif
#ifdef IFLA_BR_MCAST_HASH_ELASTICITY
case IFLA_BR_MCAST_HASH_ELASTICITY: case IFLA_BR_MCAST_HASH_ELASTICITY:
#endif
#ifdef IFLA_BR_MCAST_HASH_MAX
case 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: case IFLA_BR_MCAST_LAST_MEMBER_CNT:
#endif
#ifdef IFLA_BR_MCAST_STARTUP_QUERY_CNT
case IFLA_BR_MCAST_STARTUP_QUERY_CNT: case IFLA_BR_MCAST_STARTUP_QUERY_CNT:
#endif
u32 = NLA_DATA(nlattr); u32 = NLA_DATA(nlattr);
*u32 = tswap32(*u32); *u32 = tswap32(*u32);
break; break;
/* uint64_t */ /* uint64_t */
#ifdef IFLA_BR_HELLO_TIMER
case IFLA_BR_HELLO_TIMER: case IFLA_BR_HELLO_TIMER:
#endif
#ifdef IFLA_BR_TCN_TIMER
case IFLA_BR_TCN_TIMER: case IFLA_BR_TCN_TIMER:
#endif
#ifdef IFLA_BR_GC_TIMER
case IFLA_BR_GC_TIMER: case IFLA_BR_GC_TIMER:
#endif
#ifdef IFLA_BR_TOPOLOGY_CHANGE_TIMER
case 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: case IFLA_BR_MCAST_LAST_MEMBER_INTVL:
#endif
#ifdef IFLA_BR_MCAST_MEMBERSHIP_INTVL
case IFLA_BR_MCAST_MEMBERSHIP_INTVL: case IFLA_BR_MCAST_MEMBERSHIP_INTVL:
#endif
#ifdef IFLA_BR_MCAST_QUERIER_INTVL
case IFLA_BR_MCAST_QUERIER_INTVL: case IFLA_BR_MCAST_QUERIER_INTVL:
#endif
#ifdef IFLA_BR_MCAST_QUERY_INTVL
case 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: case IFLA_BR_MCAST_QUERY_RESPONSE_INTVL:
#endif
#ifdef IFLA_BR_MCAST_STARTUP_QUERY_INTVL
case IFLA_BR_MCAST_STARTUP_QUERY_INTVL: case IFLA_BR_MCAST_STARTUP_QUERY_INTVL:
#endif
u64 = NLA_DATA(nlattr); u64 = NLA_DATA(nlattr);
*u64 = tswap64(*u64); *u64 = tswap64(*u64);
break; break;
/* ifla_bridge_id: uin8_t[] */ /* ifla_bridge_id: uin8_t[] */
#ifdef IFLA_BR_ROOT_ID
case IFLA_BR_ROOT_ID: case IFLA_BR_ROOT_ID:
#endif
#ifdef IFLA_BR_BRIDGE_ID
case IFLA_BR_BRIDGE_ID: case IFLA_BR_BRIDGE_ID:
#endif
break; break;
default: default:
gemu_log("Unknown IFLA_BR type %d\n", nlattr->nla_type); 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_PROXYARP:
case IFLA_BRPORT_LEARNING_SYNC: case IFLA_BRPORT_LEARNING_SYNC:
case IFLA_BRPORT_PROXYARP_WIFI: case IFLA_BRPORT_PROXYARP_WIFI:
#ifdef IFLA_BRPORT_TOPOLOGY_CHANGE_ACK
case IFLA_BRPORT_TOPOLOGY_CHANGE_ACK: case IFLA_BRPORT_TOPOLOGY_CHANGE_ACK:
#endif
#ifdef IFLA_BRPORT_CONFIG_PENDING
case IFLA_BRPORT_CONFIG_PENDING: case IFLA_BRPORT_CONFIG_PENDING:
#endif
#ifdef IFLA_BRPORT_MULTICAST_ROUTER
case IFLA_BRPORT_MULTICAST_ROUTER: case IFLA_BRPORT_MULTICAST_ROUTER:
#endif
break; break;
/* uint16_t */ /* uint16_t */
case IFLA_BRPORT_PRIORITY: case IFLA_BRPORT_PRIORITY:
#ifdef IFLA_BRPORT_DESIGNATED_PORT
case IFLA_BRPORT_DESIGNATED_PORT: case IFLA_BRPORT_DESIGNATED_PORT:
#endif
#ifdef IFLA_BRPORT_DESIGNATED_COST
case IFLA_BRPORT_DESIGNATED_COST: case IFLA_BRPORT_DESIGNATED_COST:
#endif
#ifdef IFLA_BRPORT_ID
case IFLA_BRPORT_ID: case IFLA_BRPORT_ID:
#endif
#ifdef IFLA_BRPORT_NO
case IFLA_BRPORT_NO: case IFLA_BRPORT_NO:
#endif
u16 = NLA_DATA(nlattr); u16 = NLA_DATA(nlattr);
*u16 = tswap16(*u16); *u16 = tswap16(*u16);
break; break;
@ -1963,25 +1887,15 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr,
*u32 = tswap32(*u32); *u32 = tswap32(*u32);
break; break;
/* uint64_t */ /* uint64_t */
#ifdef IFLA_BRPORT_MESSAGE_AGE_TIMER
case IFLA_BRPORT_MESSAGE_AGE_TIMER: case IFLA_BRPORT_MESSAGE_AGE_TIMER:
#endif
#ifdef IFLA_BRPORT_FORWARD_DELAY_TIMER
case IFLA_BRPORT_FORWARD_DELAY_TIMER: case IFLA_BRPORT_FORWARD_DELAY_TIMER:
#endif
#ifdef IFLA_BRPORT_HOLD_TIMER
case IFLA_BRPORT_HOLD_TIMER: case IFLA_BRPORT_HOLD_TIMER:
#endif
u64 = NLA_DATA(nlattr); u64 = NLA_DATA(nlattr);
*u64 = tswap64(*u64); *u64 = tswap64(*u64);
break; break;
/* ifla_bridge_id: uint8_t[] */ /* ifla_bridge_id: uint8_t[] */
#ifdef IFLA_BRPORT_ROOT_ID
case IFLA_BRPORT_ROOT_ID: case IFLA_BRPORT_ROOT_ID:
#endif
#ifdef IFLA_BRPORT_BRIDGE_ID
case IFLA_BRPORT_BRIDGE_ID: case IFLA_BRPORT_BRIDGE_ID:
#endif
break; break;
default: default:
gemu_log("Unknown IFLA_BRPORT type %d\n", nlattr->nla_type); gemu_log("Unknown IFLA_BRPORT type %d\n", nlattr->nla_type);