qemu: monitor: Remove diskSecretLookup monitor event

After the text monitor was deleted this event can't be triggered.
Remove it and all the unnecessary code.

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

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 895843b86731142a329c8df7b61b7b87424fa138..43f1d2f8167131096e12db8f9d1160113e50dfcb 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1292,22 +1292,6 @@ qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon,
     } while (0)
 
 
-int
-qemuMonitorGetDiskSecret(qemuMonitorPtr mon,
-                         const char *path,
-                         char **secret,
-                         size_t *secretLen)
-{
-    int ret = -1;
-    *secret = NULL;
-    *secretLen = 0;
-
-    QEMU_MONITOR_CALLBACK(mon, ret, diskSecretLookup, mon->vm,
-                          path, secret, secretLen);
-    return ret;
-}
-
-
 int
 qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event,
                      long long seconds, unsigned int micros,

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index c10cecd8888328da144b5948cd139426e6adc998..c28db1a52b8b82dceeb58845fa2f81c08f42dcfc 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -121,12 +121,6 @@ typedef void (*qemuMonitorEofNotifyCallback)(qemuMonitorPtr mon,
 typedef void (*qemuMonitorErrorNotifyCallback)(qemuMonitorPtr mon,
                                                virDomainObjPtr vm,
                                                void *opaque);
-typedef int (*qemuMonitorDiskSecretLookupCallback)(qemuMonitorPtr mon,
-                                                   virDomainObjPtr vm,
-                                                   const char *path,
-                                                   char **secret,
-                                                   size_t *secretLen,
-                                                   void *opaque);
 typedef int (*qemuMonitorDomainEventCallback)(qemuMonitorPtr mon,
                                               virDomainObjPtr vm,
                                               const char *event,
@@ -285,7 +279,6 @@ struct _qemuMonitorCallbacks {
     qemuMonitorDestroyCallback destroy;
     qemuMonitorEofNotifyCallback eofNotify;
     qemuMonitorErrorNotifyCallback errorNotify;
-    qemuMonitorDiskSecretLookupCallback diskSecretLookup;
     qemuMonitorDomainEventCallback domainEvent;
     qemuMonitorDomainShutdownCallback domainShutdown;
     qemuMonitorDomainResetCallback domainReset;
@@ -369,11 +362,6 @@ int qemuMonitorHMPCommandWithFd(qemuMonitorPtr mon,
 # define qemuMonitorHMPCommand(mon, cmd, reply) \
     qemuMonitorHMPCommandWithFd(mon, cmd, -1, reply)
 
-int qemuMonitorGetDiskSecret(qemuMonitorPtr mon,
-                             const char *path,
-                             char **secret,
-                             size_t *secretLen);
-
 int qemuMonitorEmitEvent(qemuMonitorPtr mon, const char *event,
                          long long seconds, unsigned int micros,
                          const char *details);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 174d932ae75073412ab09629fca1e164860fdd29..ac2049b95df5d9ef278d896d2553cd6af7b4e3b8 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -438,33 +438,6 @@ qemuProcessGetVolumeQcowPassphrase(virDomainDiskDefPtr disk,
     return ret;
 }
 
-static int
-qemuProcessFindVolumeQcowPassphrase(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-                                    virDomainObjPtr vm,
-                                    const char *path,
-                                    char **secretRet,
-                                    size_t *secretLen,
-                                    void *opaque ATTRIBUTE_UNUSED)
-{
-    virDomainDiskDefPtr disk;
-    int ret = -1;
-
-    virObjectLock(vm);
-    if (!(disk = virDomainDiskByName(vm->def, path, true))) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("no disk found with path %s"),
-                       path);
-        goto cleanup;
-    }
-
-    ret = qemuProcessGetVolumeQcowPassphrase(disk, secretRet, secretLen);
-
- cleanup:
-    virObjectUnlock(vm);
-    return ret;
-}
-
-
 static int
 qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
                        virDomainObjPtr vm,
@@ -1711,7 +1684,6 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 static qemuMonitorCallbacks monitorCallbacks = {
     .eofNotify = qemuProcessHandleMonitorEOF,
     .errorNotify = qemuProcessHandleMonitorError,
-    .diskSecretLookup = qemuProcessFindVolumeQcowPassphrase,
     .domainEvent = qemuProcessHandleEvent,
     .domainShutdown = qemuProcessHandleShutdown,
     .domainStop = qemuProcessHandleStop,