[libvirt] [PATCH] qemu: use "id" instead of deprecated "name" for -net

[Laine Stump]

On 10/08/2018 10:54 AM, Ján Tomko wrote:
> -net name= will be deprecated in QEMU 3.1:
> commit 101625a4d4ac7e96227a156bc5f6d21a9cc383cd
>     net: Deprecate the "name" parameter of -net
> git describe: v3.0.0-791-g101625a4d4
>
> Use the id option instead, supported since QEMU 1.2:
> commit 6687b79d636cd60ed9adb1177d0d946b58fa7717
>     convert net_client_init() to OptsVisitor
> git describe: v1.0-3564-g6687b79d63 contains: v1.2.0-rc0~142^2~8
>
> Thankfully, libvirt only uses -net for non-PCI, non-virtio NICs
> on ARM.
>
> Signed-off-by: Ján Tomko <jtomko at redhat.com>
> ---
>  src/qemu/qemu_command.c                          | 2 +-
>  tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
> index d77cf8c2d6..269276f2f9 100644
> --- a/src/qemu/qemu_command.c
> +++ b/src/qemu/qemu_command.c
> @@ -3516,7 +3516,7 @@ qemuBuildLegacyNicStr(virDomainNetDefPtr net)
>                               net->info.alias,
>                               (net->model ? ",model=" : ""),
>                               (net->model ? net->model : ""),
> -                             (net->info.alias ? ",name=" : ""),
> +                             (net->info.alias ? ",id=" : ""),
>                               (net->info.alias ? net->info.alias : "")));
>      return str;
>  }
> diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
> index 90661d8b55..b925baa0e0 100644
> --- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
> +++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
> @@ -27,6 +27,6 @@ server,nowait \
>  -usb \
>  -drive file=/arm.raw,format=raw,if=sd,index=0 \
>  -netdev user,id=hostnet0 \
> --net nic,macaddr=52:54:00:09:a4:37,netdev=hostnet0,model=lan9118,name=net0 \
> +-net nic,macaddr=52:54:00:09:a4:37,netdev=hostnet0,model=lan9118,id=net0 \
>  -chardev pty,id=charserial0 \
>  -serial chardev:charserial0


Reviewed-by: Laine Stump <laine at laine.org>