Rename parameter in qemuMonitorDeviceDel

The parameter for the qemuMonitorDeviceDel() is a device alias,
not a device config string. Rename the parameter reflect this
and avoid confusion to readers.

* src/qemu/qemu_monitor.c, src/qemu/qemu_monitor.h,
  src/qemu/qemu_monitor_json.c, src/qemu/qemu_monitor_json.h,
  src/qemu/qemu_monitor_text.c, src/qemu/qemu_monitor_text.h:
  Rename devicestr to devalias in qemuMonitorDeviceDel()

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 20eaa1165b74e9ab1d962f6be83ea200bc3b07a0..c4f2725351785dd1c1a851b44ad0ab9d0bd767c9 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1453,15 +1453,15 @@ int qemuMonitorGetAllPCIAddresses(qemuMonitorPtr mon,
 }
 
 int qemuMonitorDelDevice(qemuMonitorPtr mon,
-                         const char *devicestr)
+                         const char *devalias)
 {
-    DEBUG("mon=%p, fd=%d device(del)=%s", mon, mon->fd, devicestr);
+    DEBUG("mon=%p, fd=%d devalias=%s", mon, mon->fd, devalias);
     int ret;
 
     if (mon->json)
-        ret = qemuMonitorJSONDelDevice(mon, devicestr);
+        ret = qemuMonitorJSONDelDevice(mon, devalias);
     else
-        ret = qemuMonitorTextDelDevice(mon, devicestr);
+        ret = qemuMonitorTextDelDevice(mon, devalias);
     return ret;
 }
 

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 8410b022f7cd183ca16d292729335a9b91db7af6..251233a541a8ae106f7d57b2cbf60b2202d674f6 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -338,7 +338,7 @@ int qemuMonitorAddDevice(qemuMonitorPtr mon,
                          const char *devicestr);
 
 int qemuMonitorDelDevice(qemuMonitorPtr mon,
-                         const char *devicestr);
+                         const char *devalias);
 
 int qemuMonitorAddDrive(qemuMonitorPtr mon,
                         const char *drivestr);

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index d778b249a6991e20f81cecbce9fac38b6783dc15..f5c73f724ec36faeaaa3d39d1aa030c1add2103d 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -1938,14 +1938,14 @@ int qemuMonitorJSONGetAllPCIAddresses(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 
 
 int qemuMonitorJSONDelDevice(qemuMonitorPtr mon,
-                             const char *devicestr)
+                             const char *devalias)
 {
     int ret;
     virJSONValuePtr cmd;
     virJSONValuePtr reply = NULL;
 
     cmd = qemuMonitorJSONMakeCommand("device_del",
-                                     "s:config", devicestr,
+                                     "s:config", devalias,
                                      NULL);
     if (!cmd)
         return -1;

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 53d374e5ab8f08e4e93b950c9aac448cd176c010..f404c561d1929e539bd203b25ca1c5c119f4dae4 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -169,7 +169,7 @@ int qemuMonitorJSONAddDevice(qemuMonitorPtr mon,
                              const char *devicestr);
 
 int qemuMonitorJSONDelDevice(qemuMonitorPtr mon,
-                             const char *devicestr);
+                             const char *devalias);
 
 int qemuMonitorJSONAddDrive(qemuMonitorPtr mon,
                             const char *drivestr);

diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c
index 99427682e9502a592bccd8201ffc91826b2727a4..48c9a545eb55d8414d78cf2e4479333263a67c5b 100644 (file)
--- a/src/qemu/qemu_monitor_text.c
+++ b/src/qemu/qemu_monitor_text.c
@@ -2133,14 +2133,14 @@ error:
 
 
 int qemuMonitorTextDelDevice(qemuMonitorPtr mon,
-                             const char *devicestr)
+                             const char *devalias)
 {
     char *cmd = NULL;
     char *reply = NULL;
     char *safedev;
     int ret = -1;
 
-    if (!(safedev = qemuMonitorEscapeArg(devicestr))) {
+    if (!(safedev = qemuMonitorEscapeArg(devalias))) {
         virReportOOMError();
         goto cleanup;
     }
@@ -2152,13 +2152,13 @@ int qemuMonitorTextDelDevice(qemuMonitorPtr mon,
 
     if (qemuMonitorCommand(mon, cmd, &reply) < 0) {
         qemuReportError(VIR_ERR_OPERATION_FAILED,
-                        _("cannot detach %s device"), devicestr);
+                        _("cannot detach %s device"), devalias);
         goto cleanup;
     }
 
     if (STRNEQ(reply, "")) {
         qemuReportError(VIR_ERR_OPERATION_FAILED,
-                        _("detaching %s device failed: %s"), devicestr, reply);
+                        _("detaching %s device failed: %s"), devalias, reply);
         goto cleanup;
     }
 

diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h
index fb7d08b3fc00948618f3ddec25d60f5fc92671ce..3200660c4d82cbefa9c113f346f5287cdd6fd43a 100644 (file)
--- a/src/qemu/qemu_monitor_text.h
+++ b/src/qemu/qemu_monitor_text.h
@@ -168,7 +168,7 @@ int qemuMonitorTextAddDevice(qemuMonitorPtr mon,
                              const char *devicestr);
 
 int qemuMonitorTextDelDevice(qemuMonitorPtr mon,
-                             const char *devicestr);
+                             const char *devalias);
 
 int qemuMonitorTextAddDrive(qemuMonitorPtr mon,
                              const char *drivestr);