qemu: revert patch - bandwidth tuning in session mode

Since there was a valid note to patch 43b67f2e about the best spot to
check for bandwidth set call while having libvirt daemon run in session
mode, this patch reverts previous changes dealing with bandwith
(also reverts adding variable @cfg in qemuDomainGetNumaParameters which
 does not have any use at the moment, but getting and unreferencing
 driver's config) in qemu_driver.c and qemu_command.c. There will be
another patch in the series which introduces the fix itself.

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 13b54dd02f7306e6aea5d31726e3377403218e91..90d404996e2872bfd8cef6e00597f1afef419572 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7841,17 +7841,6 @@ qemuBuildCommandLine(virConnectPtr conn,
                            _("CPU tuning is not available in session mode"));
             goto error;
         }
-
-        virDomainNetDefPtr *nets = def->nets;
-        virNetDevBandwidthPtr bandwidth = NULL;
-        size_t nnets = def->nnets;
-        for (i = 0; i < nnets; i++) {
-            if ((bandwidth = virDomainNetGetActualBandwidth(nets[i])) != NULL) {
-                virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                    _("Network bandwidth tuning is not available in session mode"));
-                goto error;
-            }
-        }
     }
 
     for (i = 0; i < def->ngraphics; ++i) {

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6fc15c05143da68ba17565d94ac1393c135b3863..b70961f779f0ccdec1cfd5b783dd7fbec50e5836 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9384,7 +9384,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
     size_t i;
     virDomainObjPtr vm = NULL;
     virDomainDefPtr persistentDef = NULL;
-    virQEMUDriverConfigPtr cfg = NULL;
     char *nodeset = NULL;
     int ret = -1;
     virCapsPtr caps = NULL;
@@ -9403,7 +9402,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
         return -1;
 
     priv = vm->privateData;
-    cfg = virQEMUDriverGetConfig(driver);
 
     if (virDomainGetNumaParametersEnsureACL(dom->conn, vm->def) < 0)
         goto cleanup;
@@ -9477,7 +9475,6 @@ qemuDomainGetNumaParameters(virDomainPtr dom,
     if (vm)
         virObjectUnlock(vm);
     virObjectUnref(caps);
-    virObjectUnref(cfg);
     return ret;
 }
 
@@ -10448,12 +10445,6 @@ qemuDomainSetInterfaceParameters(virDomainPtr dom,
     if (virDomainSetInterfaceParametersEnsureACL(dom->conn, vm->def, flags) < 0)
         goto cleanup;
 
-    if (!cfg->privileged) {
-        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-                       _("Network bandwidth tuning is not available in session mode"));
-        goto cleanup;
-    }
-
     if (!(caps = virQEMUDriverGetCapabilities(driver, false)))
         goto cleanup;