[PATCH 07/17] qemu: monitor: Always assume support for QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT
The flat mode of 'query-named-block-nodes' is supported since qemu-5.0.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_monitor.c | 1 -
src/qemu/qemu_monitor_json.c | 2 +-
src/qemu/qemu_monitor_priv.h | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 724e82e8a4..8d8e73d38d 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -600,7 +600,6 @@ qemuMonitorOpenInternal(virDomainObj *vm,
mon->cb = cb;
if (priv) {
- mon->queryNamedBlockNodesFlat = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT);
mon->blockjobMaskProtocol = virQEMUCapsGet(priv->qemuCaps,
QEMU_CAPS_BLOCKJOB_BACKING_MASK_PROTOCOL);
}
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 74420b2ee7..3caeb39a1b 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2085,7 +2085,7 @@ qemuMonitorJSONQueryNamedBlockNodes(qemuMonitor *mon)
g_autoptr(virJSONValue) reply = NULL;
if (!(cmd = qemuMonitorJSONMakeCommand("query-named-block-nodes",
- "B:flat",
mon->queryNamedBlockNodesFlat,
+ "b:flat", true,
NULL)))
return NULL;
diff --git a/src/qemu/qemu_monitor_priv.h b/src/qemu/qemu_monitor_priv.h
index 8cb5e2c3a4..60a3cedb64 100644
--- a/src/qemu/qemu_monitor_priv.h
+++ b/src/qemu/qemu_monitor_priv.h
@@ -88,8 +88,6 @@ struct _qemuMonitor {
void *logOpaque;
virFreeCallback logDestroy;
- /* query-named-block-nodes supports the 'flat' option */
- bool queryNamedBlockNodesFlat;
/* use the backing-mask-protocol flag of block-commit/stream */
bool blockjobMaskProtocol;
};
--
2.48.1