Commit 01154f79 authored by Laurent Vivier's avatar Laurent Vivier
Browse files

linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function 



QEMU_IFLA_BR_MULTI_BOOLOPT has been added to the wrong function
host_to_target_slave_data_bridge_nlattr(). Move it to
host_to_target_data_bridge_nlattr().

This fixes following error:
  Unknown QEMU_IFLA_BR type 46

Fixes: 61b463fb ("linux-user: add new netlink types")
Message-Id: <20190626150855.27446-1-laurent@vivier.eu>
Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
parent 64ce541c

linux-user/fd-trans.c

+6 −6
Original line number Diff line number Diff line
@@ -483,6 +483,12 @@ static abi_long host_to_target_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BR_ROOT_ID:

    case QEMU_IFLA_BR_BRIDGE_ID:

        break;

    /* br_boolopt_multi { uint32_t, uint32_t } */

    case QEMU_IFLA_BR_MULTI_BOOLOPT:

        u32 = NLA_DATA(nlattr);

        u32[0] = tswap32(u32[0]); /* optval */

        u32[1] = tswap32(u32[1]); /* optmask */

        break;

    default:

        gemu_log("Unknown QEMU_IFLA_BR type %d\n", nlattr->nla_type);

        break;
@@ -546,12 +552,6 @@ static abi_long host_to_target_slave_data_bridge_nlattr(struct nlattr *nlattr, 
    case QEMU_IFLA_BRPORT_ROOT_ID:

    case QEMU_IFLA_BRPORT_BRIDGE_ID:

        break;

    /* br_boolopt_multi { uint32_t, uint32_t } */

    case QEMU_IFLA_BR_MULTI_BOOLOPT:

        u32 = NLA_DATA(nlattr);

        u32[0] = tswap32(u32[0]); /* optval */

        u32[1] = tswap32(u32[1]); /* optmask */

        break;

    default:

        gemu_log("Unknown QEMU_IFLA_BRPORT type %d\n", nlattr->nla_type);

        break;