External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-04-01 20:05:19 +00:00
Code

qemu: Set default qdisc before setting bandwidth

Browse Source 
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@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2020-12-04 13:02:53 +01:00
parent 5ac2439a83
commit abb1554a2d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/qemu/qemu_command.c
View File

@ -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;

4
src/qemu/qemu_hotplug.c
View File

@ -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)