qemu: monitor: Remove unused qemuMonitorDiskNameLookup

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@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 55e09e40630f651d78a49984391e36c7d8c9df25..8d71f90a1b3f666e913e90c5f15048064c600990 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2879,20 +2879,6 @@ qemuMonitorBlockCommit(qemuMonitor *mon,
 }
 
 
-/* Determine the name that qemu is using for tracking the backing
- * element TARGET within the chain starting at TOP.  */
-char *
-qemuMonitorDiskNameLookup(qemuMonitor *mon,
-                          const char *device,
-                          virStorageSource *top,
-                          virStorageSource *target)
-{
-    QEMU_CHECK_MONITOR_NULL(mon);
-
-    return qemuMonitorJSONDiskNameLookup(mon, device, top, target);
-}
-
-
 /* Use the block-job-complete monitor command to pivot a block copy job.  */
 int
 qemuMonitorDrivePivot(qemuMonitor *mon,

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 0c8e3d606e2c30eff0e4670e8ec9b6d3baa4a9f1..502a02d1748f1aca3978a412de7bff26f9884d61 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -998,11 +998,6 @@ int qemuMonitorBlockCommit(qemuMonitor *mon,
                            const char *backingName,
                            unsigned long long bandwidth)
     ATTRIBUTE_NONNULL(2);
-char *qemuMonitorDiskNameLookup(qemuMonitor *mon,
-                                const char *device,
-                                virStorageSource *top,
-                                virStorageSource *target)
-    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
 
 int qemuMonitorArbitraryCommand(qemuMonitor *mon,
                                 const char *cmd,

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index da22db45fbe7af250c69c6d822077f08927d4f9b..a39c707b5591cba4fab0411e2ef3551c8c2ab436 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -4180,83 +4180,6 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon,
     return 0;
 }
 
-
-static char *
-qemuMonitorJSONDiskNameLookupOne(virJSONValue *image,
-                                 virStorageSource *top,
-                                 virStorageSource *target)
-{
-    virJSONValue *backing;
-    char *ret;
-
-    /* The caller will report a generic message if we return NULL
-     * without an error; but in some cases we can improve by reporting
-     * a more specific message.  */
-    if (!top || !image)
-        return NULL;
-    if (top != target) {
-        backing = virJSONValueObjectGetObject(image, "backing-image");
-        return qemuMonitorJSONDiskNameLookupOne(backing, top->backingStore,
-                                                target);
-    }
-    ret = g_strdup(virJSONValueObjectGetString(image, "filename"));
-    /* Sanity check - the name qemu gave us should resolve to the same
-       file tracked by our target description. */
-    if (virStorageSourceIsLocalStorage(target) &&
-        STRNEQ(ret, target->path) &&
-        !virFileLinkPointsTo(ret, target->path)) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("qemu block name '%s' doesn't match expected '%s'"),
-                       ret, target->path);
-        VIR_FREE(ret);
-    }
-    return ret;
-}
-
-
-char *
-qemuMonitorJSONDiskNameLookup(qemuMonitor *mon,
-                              const char *device,
-                              virStorageSource *top,
-                              virStorageSource *target)
-{
-    g_autoptr(virJSONValue) devices = NULL;
-    size_t i;
-
-    if (!(devices = qemuMonitorJSONQueryBlock(mon)))
-        return NULL;
-
-    for (i = 0; i < virJSONValueArraySize(devices); i++) {
-        virJSONValue *dev;
-        virJSONValue *inserted;
-        virJSONValue *image;
-        const char *thisdev;
-
-        if (!(dev = qemuMonitorJSONGetBlockDev(devices, i)))
-            return NULL;
-
-        if (!(thisdev = qemuMonitorJSONGetBlockDevDevice(dev)))
-            return NULL;
-
-        if (STREQ(thisdev, device)) {
-            if ((inserted = virJSONValueObjectGetObject(dev, "inserted")) &&
-                (image = virJSONValueObjectGetObject(inserted, "image"))) {
-                return qemuMonitorJSONDiskNameLookupOne(image, top, target);
-            }
-        }
-    }
-    /* Guarantee an error when returning NULL, but don't override a
-     * more specific error if one was already generated.  */
-    if (virGetLastErrorCode() == VIR_ERR_OK) {
-        virReportError(VIR_ERR_INTERNAL_ERROR,
-                       _("unable to find backing name for device %s"),
-                       device);
-    }
-
-    return NULL;
-}
-
-
 int qemuMonitorJSONArbitraryCommand(qemuMonitor *mon,
                                     const char *cmd_str,
                                     int fd,

diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 5d66aa1391ce866a9180a4fce99d1d99a8887944..25de6d80108ff12187d4300e91d4c03df23c23c7 100644 (file)
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -333,14 +333,6 @@ qemuMonitorJSONBlockCommit(qemuMonitor *mon,
                            unsigned long long bandwidth)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 
-char *
-qemuMonitorJSONDiskNameLookup(qemuMonitor *mon,
-                              const char *device,
-                              virStorageSource *top,
-                              virStorageSource *target)
-    ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
-    ATTRIBUTE_NONNULL(4);
-
 int
 qemuMonitorJSONArbitraryCommand(qemuMonitor *mon,
                                 const char *cmd_str,