qemu: monitor: Remove unused 'locked' property from struct qemuDomainDiskInfo

We don't use it for anything useful so it does not make much sense to
extract it.

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

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index bff293fc0a4f8bdbaa0181ca8d0916b75c406807..7b79d7725725be2686384494bd1e0f29d6e975c5 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -438,7 +438,6 @@ struct _qemuDomainVcpuPrivate {
 
 struct qemuDomainDiskInfo {
     bool removable;
-    bool locked;
     bool tray;
     bool tray_open;
     bool empty;

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 5b229090d68b1329069bd6ab2b54b272cc1d99ea..4b48554c2de0195165046c5483ba000f6fc94670 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2243,13 +2243,6 @@ int qemuMonitorJSONGetBlockInfo(qemuMonitorPtr mon,
             goto cleanup;
         }
 
-        if (virJSONValueObjectGetBoolean(dev, "locked", &info->locked) < 0) {
-            virReportError(VIR_ERR_INTERNAL_ERROR,
-                           _("cannot read %s value"),
-                           "locked");
-            goto cleanup;
-        }
-
         /* 'tray_open' is present only if the device has a tray */
         if (virJSONValueObjectGetBoolean(dev, "tray_open", &info->tray_open) == 0)
             info->tray = true;

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index 3a0490bd261ae3dda4232d1fca3e2d36bc484efe..955892b1f61e11a09b353d1c777d8492b1efb19e 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1647,7 +1647,6 @@ testQemuMonitorJSONqemuMonitorJSONGetBlockInfo(const void *data)
     if (VIR_ALLOC(info) < 0)
         goto cleanup;
 
-    info->locked = true;
     info->removable = true;
     info->tray = true;