From: Peter Krempa <[email protected]> The field is only read in tests. Other code using it no longer exists.
Signed-off-by: Peter Krempa <[email protected]> --- src/qemu/qemu_domain.h | 1 - src/qemu/qemu_monitor.c | 1 - src/qemu/qemu_monitor_json.c | 5 +---- tests/qemumonitorjsontest.c | 4 ++-- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 3361e97315..095c36b8ac 100644 --- 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 504500c864..6acc80832c 100644 --- 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 f345741207..a7e095a648 100644 --- 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 bfe81739a7..efa2400750 100644 --- 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); } -- 2.53.0
