From abb1554a2d3351498de2da0f81c1d9eb2644b779 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Fri, 4 Dec 2020 13:02:53 +0100 Subject: [PATCH] qemu: Set default qdisc before setting bandwidth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While the code that's setting default qdisc is clever enough to not overwrite any bandwidth (potentially) set by virNetDevBandwidthSet() (and thus the root qdisc htb is not replaced with noqueue), it does print a debug message when that's the case. It's needless. We can set the root qdisc beforehand and let virNetDevBandwidthSet() overwrite it. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrangé --- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9fcbb6c413..02f956ce48 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8132,6 +8132,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, break; } + qemuDomainInterfaceSetDefaultQDisc(driver, net); + /* Set bandwidth or warn if requested and not supported. */ actualBandwidth = virDomainNetGetActualBandwidth(net); if (actualBandwidth) { @@ -8146,8 +8148,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, } } - qemuDomainInterfaceSetDefaultQDisc(driver, net); - if (net->mtu && virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 57635cd419..e5848d7de4 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -1371,6 +1371,8 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, if (qemuInterfaceStartDevice(net) < 0) goto cleanup; + qemuDomainInterfaceSetDefaultQDisc(driver, net); + /* Set bandwidth or warn if requested and not supported. */ actualBandwidth = virDomainNetGetActualBandwidth(net); if (actualBandwidth) { @@ -1389,8 +1391,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, virNetDevSetMTU(net->ifname, net->mtu) < 0) goto cleanup; - qemuDomainInterfaceSetDefaultQDisc(driver, net); - for (i = 0; i < tapfdSize; i++) { if (qemuSecuritySetTapFDLabel(driver->securityManager, vm->def, tapfd[i]) < 0)