[PATCH 1/2] qemu: Set default qdisc before setting bandwidth
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 <mprivozn(a)redhat.com>
---
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 5aff89188a..ece7f6a4d3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8127,6 +8127,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
break;
}
+ qemuDomainInterfaceSetDefaultQDisc(driver, net);
+
/* Set bandwidth or warn if requested and not supported. */
actualBandwidth = virDomainNetGetActualBandwidth(net);
if (actualBandwidth) {
@@ -8141,8 +8143,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 2c12ef60af..235e9e177a 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -1361,6 +1361,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) {
@@ -1379,8 +1381,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)
--
2.26.2