e28b6e1c9e
Fix nwfilter crash during firewalld install (bz #1014933) Allow QoS change with update-device (bz #1014200)
67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
From d78741e154c932ba45fc31d6a2ae615f2f1d1e15 Mon Sep 17 00:00:00 2001
|
|
From: Michal Privoznik <mprivozn@redhat.com>
|
|
Date: Tue, 1 Oct 2013 15:04:48 +0200
|
|
Subject: [PATCH] qemu_hotplug: Allow QoS update in qemuDomainChangeNet
|
|
|
|
The qemuDomainChangeNet() is called when 'virsh update-device' is
|
|
invoked on a NIC. Currently, we fail to update the QoS even though
|
|
we have routines for that.
|
|
|
|
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
(cherry picked from commit 9fa10d3901a14997f724fe50ad8a33d7f0d23abe)
|
|
---
|
|
src/qemu/qemu_hotplug.c | 19 +++++++++++++++++--
|
|
1 file changed, 17 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
|
|
index f88632d..dfcbd11 100644
|
|
--- a/src/qemu/qemu_hotplug.c
|
|
+++ b/src/qemu/qemu_hotplug.c
|
|
@@ -1470,6 +1470,7 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
|
bool needFilterChange = false;
|
|
bool needLinkStateChange = false;
|
|
bool needReplaceDevDef = false;
|
|
+ bool needBandwidthSet = false;
|
|
int ret = -1;
|
|
|
|
if (!devslot || !(olddev = *devslot)) {
|
|
@@ -1738,8 +1739,6 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
|
virDomainNetGetActualDirectMode(olddev) != virDomainNetGetActualDirectMode(olddev) ||
|
|
!virNetDevVPortProfileEqual(virDomainNetGetActualVirtPortProfile(olddev),
|
|
virDomainNetGetActualVirtPortProfile(newdev)) ||
|
|
- !virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev),
|
|
- virDomainNetGetActualBandwidth(newdev)) ||
|
|
!virNetDevVlanEqual(virDomainNetGetActualVlan(olddev),
|
|
virDomainNetGetActualVlan(newdev))) {
|
|
needReconnect = true;
|
|
@@ -1748,6 +1747,10 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
|
if (olddev->linkstate != newdev->linkstate)
|
|
needLinkStateChange = true;
|
|
|
|
+ if (!virNetDevBandwidthEqual(virDomainNetGetActualBandwidth(olddev),
|
|
+ virDomainNetGetActualBandwidth(newdev)))
|
|
+ needBandwidthSet = true;
|
|
+
|
|
/* FINALLY - actually perform the required actions */
|
|
|
|
if (needReconnect) {
|
|
@@ -1757,6 +1760,18 @@ qemuDomainChangeNet(virQEMUDriverPtr driver,
|
|
goto cleanup;
|
|
}
|
|
|
|
+ if (needBandwidthSet) {
|
|
+ if (virNetDevBandwidthSet(newdev->ifname,
|
|
+ virDomainNetGetActualBandwidth(newdev),
|
|
+ false) < 0) {
|
|
+ virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
+ _("cannot set bandwidth limits on %s"),
|
|
+ newdev->ifname);
|
|
+ goto cleanup;
|
|
+ }
|
|
+ needReplaceDevDef = true;
|
|
+ }
|
|
+
|
|
if (needBridgeChange) {
|
|
if (qemuDomainChangeNetBridge(dom->conn, vm, olddev, newdev) < 0)
|
|
goto cleanup;
|