diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cb716ff849d0ecf67c7d373ee31a19697af75049..fa01ab5280d81b74f8303469a9bb4fe16c7aa150 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2084,7 +2084,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 ec15f79e76734f7419d45d88790463c054677eeb..eb5c8d70bb0f94755a9e9b13696d6b72d3a72a4f 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3917,15 +3917,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 65702eae05eaa62ac333f72a9f87c5abf00afb88..c6c20b7441b71d274119b7fbf6c4af3c135bf100 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -1042,8 +1042,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 7fd8e756b3a67aaa651b1cec686059d872d31a98..410fa178b2d6dcd57b0f05636c53d746a1e49ee3 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -5944,8 +5944,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; @@ -5959,7 +5959,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 c6ad83af4c062e9770b0fd7beaf091d2e7459544..405f0971e5776618afe9d0e390e23ece65f0105c 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -440,8 +440,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);