提交 0de90bd7 编写于 作者: M Michal Privoznik

qemu: Rename qemuMonitorGetObjectProps to qemuMonitorGetDeviceProps

This function is indeed getting -device properties and not
-object properties. The current name is misleading.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 0272a3ff
...@@ -2084,7 +2084,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps, ...@@ -2084,7 +2084,7 @@ virQEMUCapsProbeQMPObjects(virQEMUCapsPtr qemuCaps,
if (cap >= 0 && !virQEMUCapsGet(qemuCaps, cap)) if (cap >= 0 && !virQEMUCapsGet(qemuCaps, cap))
continue; continue;
if ((nvalues = qemuMonitorGetObjectProps(mon, if ((nvalues = qemuMonitorGetDeviceProps(mon,
type, type,
&values)) < 0) &values)) < 0)
return -1; return -1;
......
...@@ -3917,15 +3917,15 @@ qemuMonitorGetObjectTypes(qemuMonitorPtr mon, ...@@ -3917,15 +3917,15 @@ qemuMonitorGetObjectTypes(qemuMonitorPtr mon,
int int
qemuMonitorGetObjectProps(qemuMonitorPtr mon, qemuMonitorGetDeviceProps(qemuMonitorPtr mon,
const char *type, const char *device,
char ***props) char ***props)
{ {
VIR_DEBUG("type=%s props=%p", type, props); VIR_DEBUG("device=%s props=%p", device, props);
QEMU_CHECK_MONITOR_JSON(mon); QEMU_CHECK_MONITOR_JSON(mon);
return qemuMonitorJSONGetObjectProps(mon, type, props); return qemuMonitorJSONGetDeviceProps(mon, device, props);
} }
......
...@@ -1042,8 +1042,8 @@ int qemuMonitorGetKVMState(qemuMonitorPtr mon, ...@@ -1042,8 +1042,8 @@ int qemuMonitorGetKVMState(qemuMonitorPtr mon,
int qemuMonitorGetObjectTypes(qemuMonitorPtr mon, int qemuMonitorGetObjectTypes(qemuMonitorPtr mon,
char ***types); char ***types);
int qemuMonitorGetObjectProps(qemuMonitorPtr mon, int qemuMonitorGetDeviceProps(qemuMonitorPtr mon,
const char *type, const char *device,
char ***props); char ***props);
char *qemuMonitorGetTargetArch(qemuMonitorPtr mon); char *qemuMonitorGetTargetArch(qemuMonitorPtr mon);
......
...@@ -5944,8 +5944,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, ...@@ -5944,8 +5944,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon,
#undef MAKE_SET_CMD #undef MAKE_SET_CMD
int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon,
const char *type, const char *device,
char ***props) char ***props)
{ {
int ret = -1; int ret = -1;
...@@ -5959,7 +5959,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, ...@@ -5959,7 +5959,7 @@ int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon,
*props = NULL; *props = NULL;
if (!(cmd = qemuMonitorJSONMakeCommand("device-list-properties", if (!(cmd = qemuMonitorJSONMakeCommand("device-list-properties",
"s:typename", type, "s:typename", device,
NULL))) NULL)))
return -1; return -1;
......
...@@ -440,8 +440,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, ...@@ -440,8 +440,8 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon,
qemuMonitorJSONObjectPropertyPtr prop) qemuMonitorJSONObjectPropertyPtr prop)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4); ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4);
int qemuMonitorJSONGetObjectProps(qemuMonitorPtr mon, int qemuMonitorJSONGetDeviceProps(qemuMonitorPtr mon,
const char *type, const char *device,
char ***props) char ***props)
ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon); char *qemuMonitorJSONGetTargetArch(qemuMonitorPtr mon);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册