qemu: Rename 'diskAlias' to 'device' in qemu IO error event handling

The field is named 'device' in the event so unify our naming.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index e0b1bf1d370884841117902634e0426cb7e8e67a..1227298a453fa5d789a8ba1063349a4c40c1d882 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1127,7 +1127,7 @@ qemuMonitorEmitWatchdog(qemuMonitor *mon, int action)
 
 void
 qemuMonitorEmitIOError(qemuMonitor *mon,
-                       const char *diskAlias,
+                       const char *device,
                        const char *nodename,
                        int action,
                        const char *reason)
@@ -1135,7 +1135,7 @@ qemuMonitorEmitIOError(qemuMonitor *mon,
     VIR_DEBUG("mon=%p", mon);
 
     QEMU_MONITOR_CALLBACK(mon, domainIOError, mon->vm,
-                          diskAlias, nodename, action, reason);
+                          device, nodename, action, reason);
 }
 
 

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c74892c4dc6b7968eda081fd6a75cfefee24e69a..3ec8e7227f6163b9fb13af2c6f6a39cc572213e8 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -206,7 +206,7 @@ typedef void (*qemuMonitorDomainWatchdogCallback)(qemuMonitor *mon,
                                                   int action);
 typedef void (*qemuMonitorDomainIOErrorCallback)(qemuMonitor *mon,
                                                  virDomainObj *vm,
-                                                 const char *diskAlias,
+                                                 const char *device,
                                                  const char *nodename,
                                                  int action,
                                                  const char *reason);
@@ -450,7 +450,7 @@ void qemuMonitorEmitResume(qemuMonitor *mon);
 void qemuMonitorEmitRTCChange(qemuMonitor *mon, long long offset);
 void qemuMonitorEmitWatchdog(qemuMonitor *mon, int action);
 void qemuMonitorEmitIOError(qemuMonitor *mon,
-                            const char *diskAlias,
+                            const char *device,
                             const char *nodename,
                             int action,
                             const char *reason);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index edcd8ac3a84688eca8f4ebc2b2f93fa618ef8ac6..c2a5361b79b7f07fac32d98d56cdb182a6a74761 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -824,7 +824,7 @@ qemuProcessHandleWatchdog(qemuMonitor *mon G_GNUC_UNUSED,
 static void
 qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
                          virDomainObj *vm,
-                         const char *diskAlias,
+                         const char *device,
                          const char *nodename,
                          int action,
                          const char *reason)
@@ -840,8 +840,8 @@ qemuProcessHandleIOError(qemuMonitor *mon G_GNUC_UNUSED,
     virObjectLock(vm);
     priv = QEMU_DOMAIN_PRIVATE(vm);
 
-    if (diskAlias)
-        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, diskAlias, NULL);
+    if (device)
+        disk = qemuProcessFindDomainDiskByAliasOrQOM(vm, device, NULL);
     else if (nodename)
         disk = qemuDomainDiskLookupByNodename(vm->def, NULL, nodename, NULL);
     else