qemuMonitorGetBlockIoThrottle: Drop 'diskalias' argument

Every caller will pass 'qdevid' as it's populated in the data
mandatorily with qemu-4.2 and onwards due to mandatory -blockdev use.

Thus we can drop compatibility with the old way of matching the disk via
alias.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index d3b37486c32d708a6e0e8efb3b1656b3a0869c03..430b75880b62713e44529d6f90a79ea48b68beb9 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15240,8 +15240,6 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
     virDomainDef *def = NULL;
     virDomainDef *persistentDef = NULL;
     virDomainBlockIoTuneInfo reply = {0};
-    g_autofree char *drivealias = NULL;
-    const char *qdevid = NULL;
     int ret = -1;
     int maxparams;
 
@@ -15288,14 +15286,8 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
         if (!qemuDomainDiskBlockIoTuneIsSupported(disk))
             goto endjob;
 
-        if (QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName) {
-            qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
-        } else {
-            if (!(drivealias = qemuAliasDiskDriveFromDisk(disk)))
-                goto endjob;
-        }
         qemuDomainObjEnterMonitor(vm);
-        rc = qemuMonitorGetBlockIoThrottle(priv->mon, drivealias, qdevid, &reply);
+        rc = qemuMonitorGetBlockIoThrottle(priv->mon, QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName, &reply);
         qemuDomainObjExitMonitor(vm);
 
         if (rc < 0)

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index dacf161971827393915831d314f30b0a6126df2e..5faf64a4ecda926214bd4de14b0f0ada74b11116 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2988,16 +2988,14 @@ qemuMonitorSetBlockIoThrottle(qemuMonitor *mon,
 
 int
 qemuMonitorGetBlockIoThrottle(qemuMonitor *mon,
-                              const char *drivealias,
                               const char *qdevid,
                               virDomainBlockIoTuneInfo *reply)
 {
-    VIR_DEBUG("drivealias=%s, qdevid=%s, reply=%p",
-              NULLSTR(drivealias), NULLSTR(qdevid), reply);
+    VIR_DEBUG("qdevid=%s, reply=%p", NULLSTR(qdevid), reply);
 
     QEMU_CHECK_MONITOR(mon);
 
-    return qemuMonitorJSONGetBlockIoThrottle(mon, drivealias, qdevid, reply);
+    return qemuMonitorJSONGetBlockIoThrottle(mon, qdevid, reply);
 }
 
 

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 09f22f2328a68d9e38d3b4ffb4328e1eeb973e01..6006a451a3eacbf713d840b2be34ce06941d2085 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1057,7 +1057,6 @@ int qemuMonitorSetBlockIoThrottle(qemuMonitor *mon,
                                   virDomainBlockIoTuneInfo *info);
 
 int qemuMonitorGetBlockIoThrottle(qemuMonitor *mon,
-                                  const char *drivealias,
                                   const char *qdevid,
                                   virDomainBlockIoTuneInfo *reply);
 

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 9ee8d19f03a35f72973b774870a3d78328b9d126..900cb43e749ccce3af5d9862289e83d8ab0e9bb8 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4517,7 +4517,6 @@ int qemuMonitorJSONOpenGraphics(qemuMonitor *mon,
     }
 static int
 qemuMonitorJSONBlockIoThrottleInfo(virJSONValue *io_throttle,
-                                   const char *drivealias,
                                    const char *qdevid,
                                    virDomainBlockIoTuneInfo *reply)
 {
@@ -4547,8 +4546,8 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValue *io_throttle,
             return -1;
         }
 
-        if ((drivealias && current_drive && STRNEQ(current_drive, drivealias)) ||
-            (qdevid && current_qdev && STRNEQ(current_qdev, qdevid)))
+        if (STRNEQ_NULLABLE(current_qdev, qdevid) &&
+            STRNEQ_NULLABLE(current_drive, qdevid))
             continue;
 
         found = true;
@@ -4587,7 +4586,7 @@ qemuMonitorJSONBlockIoThrottleInfo(virJSONValue *io_throttle,
     if (!found) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("cannot find throttling info for device '%1$s'"),
-                       drivealias ? drivealias : qdevid);
+                       qdevid);
         return -1;
     }
 
@@ -4640,7 +4639,6 @@ int qemuMonitorJSONSetBlockIoThrottle(qemuMonitor *mon,
 }
 
 int qemuMonitorJSONGetBlockIoThrottle(qemuMonitor *mon,
-                                      const char *drivealias,
                                       const char *qdevid,
                                       virDomainBlockIoTuneInfo *reply)
 {
@@ -4649,7 +4647,7 @@ int qemuMonitorJSONGetBlockIoThrottle(qemuMonitor *mon,
     if (!(devices = qemuMonitorJSONQueryBlock(mon)))
         return -1;
 
-    return qemuMonitorJSONBlockIoThrottleInfo(devices, drivealias, qdevid, reply);
+    return qemuMonitorJSONBlockIoThrottleInfo(devices, qdevid, reply);
 }
 
 int qemuMonitorJSONSystemWakeup(qemuMonitor *mon)

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 6f376cf9b7172705f52453c5d29d6afd6934211c..3f77ab0ab39fabf24cc64c6a07d6168d4c098954 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -407,7 +407,6 @@ qemuMonitorJSONSetBlockIoThrottle(qemuMonitor *mon,
 
 int
 qemuMonitorJSONGetBlockIoThrottle(qemuMonitor *mon,
-                                  const char *drivealias,
                                   const char *qdevid,
                                   virDomainBlockIoTuneInfo *reply);
 

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 5c056692800acfce1a3125cb82e87945d3924ed0..ba12aae5b74e7fa1128df9829053d55f9f834af9 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1897,7 +1897,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *opaque)
         return -1;
 
     if (qemuMonitorJSONGetBlockIoThrottle(qemuMonitorTestGetMonitor(test),
-                                          "drive-virtio-disk0", NULL, &info) < 0)
+                                          "drive-virtio-disk0", &info) < 0)
         goto cleanup;
 
     if (testValidateGetBlockIoThrottle(&info, &expectedInfo) < 0)