qemuDomainDiskInfo: Drop 'nodename' field

The field is only read in tests. Other code using it no longer exists.

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 3361e97315a1c5fabb596f54e2ee0546081c875c..095c36b8ac6479c03af601f4949a6e42dd1ac590 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -364,7 +364,6 @@ struct qemuDomainDiskInfo {
     bool tray_open;
     bool empty;
     int io_status;
-    char *nodename;
 };
 
 #define QEMU_DOMAIN_CHR_SOURCE_PRIVATE(dev) \

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 504500c864d1f458327de6777f6b55ee0c69c226..6acc80832c9c6daa159490a94017e1fb79c1d8c4 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1947,7 +1947,6 @@ qemuDomainDiskInfoFree(void *value)
 {
     struct qemuDomainDiskInfo *info = value;
 
-    g_free(info->nodename);
     g_free(info);
 }
 

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index f3457412073185f5edc3ec0ab48620953861f56d..a7e095a64895b511fac2aaa14c3bc194ec2dc66e 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2304,7 +2304,6 @@ qemuMonitorJSONBlockInfoAdd(GHashTable *table,
     tmp = g_new0(struct qemuDomainDiskInfo, 1);
 
     *tmp = *info;
-    tmp->nodename = g_strdup(info->nodename);
 
     g_hash_table_insert(table, g_strdup(entryname), tmp);
 
@@ -2360,9 +2359,7 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon,
             info.tray = true;
 
         /* presence of 'inserted' notifies that a medium is in the device */
-        if ((image = virJSONValueObjectGetObject(dev, "inserted"))) {
-            info.nodename = (char *) virJSONValueObjectGetString(image, "node-name");
-        } else {
+        if (!(image = virJSONValueObjectGetObject(dev, "inserted"))) {
             info.empty = true;
         }
 

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index bfe81739a795ab7ceb24fb410c8ca1eb5ebc7355..efa2400750ddd860fc01a3fa8742d6aa3077d64f 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1354,9 +1354,9 @@ static void
 testQemuMonitorJSONGetBlockInfoPrint(const struct qemuDomainDiskInfo *d)
 {
     VIR_TEST_VERBOSE("removable: %d, tray: %d, tray_open: %d, empty: %d, "
-                     "io_status: %d, nodename: '%s'",
+                     "io_status: %d",
                      d->removable, d->tray, d->tray_open, d->empty,
-                     d->io_status, NULLSTR(d->nodename));
+                     d->io_status);
 }