linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function

[Qemu-devel] [PATCH] linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function

Posted by Laurent Vivier 4 years, 9 months ago

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: 61b463fbf6cb ("linux-user: add new netlink types")
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/fd-trans.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
index 612819c1b1ec..60077ce5319d 100644
--- a/linux-user/fd-trans.c
+++ b/linux-user/fd-trans.c
@@ -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;
-- 
2.21.0

Re: [Qemu-devel] [PATCH] linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function

Posted by no-reply@patchew.org 4 years, 9 months ago

Patchew URL: https://patchew.org/QEMU/20190626150855.27446-1-laurent@vivier.eu/



Hi,

This series failed build test on s390x host. Please find the details below.






The full log is available at
http://patchew.org/logs/20190626150855.27446-1-laurent@vivier.eu/testing.s390x/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com

Re: [Qemu-devel] [PATCH] linux-user: move QEMU_IFLA_BR_MULTI_BOOLOPT to the good function

Posted by Laurent Vivier 4 years, 9 months ago

Le 26/06/2019 à 17:08, Laurent Vivier a écrit :
> 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: 61b463fbf6cb ("linux-user: add new netlink types")
> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
> ---
>  linux-user/fd-trans.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/linux-user/fd-trans.c b/linux-user/fd-trans.c
> index 612819c1b1ec..60077ce5319d 100644
> --- a/linux-user/fd-trans.c
> +++ b/linux-user/fd-trans.c
> @@ -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;
> 

Applied to my linux-user branch.

Thanks,
Laurent