[libvirt] [PATCH v1 1/7] qemu: Rename qemuMonitorGetObjectProps to qemuMonitorGetDeviceProps

This function is indeed getting -device properties and not -object properties. The current name is misleading. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_monitor.c | 8 ++++---- src/qemu/qemu_monitor.h | 4 ++-- src/qemu/qemu_monitor_json.c | 6 +++--- src/qemu/qemu_monitor_json.h | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 27180e8509..407c3229c3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2091,7 +2091,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, if (cap >= 0 && !virQEMUCapsGet(qemuCaps, cap)) continue; - if ((nvalues = qemuMonitorGetObjectProps(mon, + if ((nvalues = qemuMonitorGetDeviceProps(mon, type, &values)) < 0) return -1; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7b647525b3..8a4350f6b2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3942,15 +3942,15 @@ qemuMonitorGetObjectTypes(qemuMonitorPtr mon, int -qemuMonitorGetObjectProps(qemuMonitorPtr mon, - const char *type, +qemuMonitorGetDeviceProps(qemuMonitorPtr mon, + const char *device, char ***props) { - VIR_DEBUG("type=%s props=%p", type, props); + VIR_DEBUG("device=%s props=%p", device, props); QEMU_CHECK_MONITOR_JSON(mon); - return qemuMonitorJSONGetObjectProps(mon, type, props); + return qemuMonitorJSONGetDeviceProps(mon, device, props); } diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d04148e568..b797ea800e 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1094,8 +1094,8 @@ int qemuMonitorGetKVMState(qemuMonitorPtr mon, int qemuMonitorGetObjectTypes(qemuMonitorPtr mon, char ***types); -int qemuMonitorGetObjectProps(qemuMonitorPtr mon, - const char *type, +int qemuMonitorGetDeviceProps(qemuMonitorPtr mon, + const char *device, char ***props); char *qemuMonitorGetTargetArch(qemuMonitorPtr mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 57c2c4de0f..a90762a4ff 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -6033,8 +6033,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, #undef MAKE_SET_CMD -int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, - const char *type, +int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, + const char *device, char ***props) { int ret = -1; @@ -6048,7 +6048,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, *props = NULL; if (!(cmd = qemuMonitorJSONMakeCommand("device-list-properties", - "s:typename", type, + "s:typename", device, NULL))) return -1; diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 045df4919f..df91b0b5dc 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -441,8 +441,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, qemuMonitorJSONObjectPropertyPtr prop) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); -int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, - const char *type, +int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon, + const char *device, char ***props) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon); -- 2.16.1