[libvirt] [libvirt PATCH v2 06/44] Deprecate QEMU_CAPS_NETDEV

[Andrea Bolognani]

On Mon, 2018-04-09 at 17:19 +0200, Ján Tomko wrote:
> This makes qemuDomainSupportsNetdev identical to
> qemuDomainSupportsNicdev and leaves some code in
> qemuDomainAttachNetDevice to be cleaned up later.

[...]
> diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
> index f0d549de38..d2e00516e8 100644
> --- a/src/qemu/qemu_hotplug.c
> +++ b/src/qemu/qemu_hotplug.c
> @@ -1029,18 +1029,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
>  
>      releaseaddr = true;
>  
> -    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_NETDEV)) {
> -        vlan = -1;
> -    } else {
> -        vlan = qemuDomainNetVLAN(net);
> -
> -        if (vlan < 0) {
> -            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
> -                           _("Unable to attach network devices without vlan"));
> -            goto cleanup;
> -        }
> -    }
> -
> +    vlan = -1;

I was about to comment about how you can drop vlan entirely now,
but then I re-read the commit message and saw the next patch :)

[...]
> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
> index 288de59de1..8ff23f2ba9 100644
> --- a/tests/qemuxml2argvtest.c
> +++ b/tests/qemuxml2argvtest.c
> @@ -1204,8 +1204,7 @@ mymain(void)
>      DO_TEST("graphics-spice-auto-socket",
>              QEMU_CAPS_SPICE,
>              QEMU_CAPS_SPICE_UNIX,
> -            QEMU_CAPS_DEVICE_CIRRUS_VGA);
> -    driver.config->spiceAutoUnixSocket = true;
> +            QEMU_CAPS_DEVICE_CIRRUS_VGA); driver.config->spiceAutoUnixSocket = true;
>      DO_TEST("graphics-spice-auto-socket-cfg",
>              QEMU_CAPS_SPICE,
>              QEMU_CAPS_SPICE_UNIX,

This hunk must have slipped in, please make sure you drop it
before pushing.

Reviewed-by: Andrea Bolognani <abologna at redhat.com>

-- 
Andrea Bolognani / Red Hat / Virtualization