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@redhat.com>
This commit is contained in:
Michal Privoznik 2018-04-12 13:27:54 +02:00
parent 0272a3ffae
commit 0de90bd710
5 changed files with 12 additions and 12 deletions

View File

@ -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;

View File

@ -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);
}

View File

@ -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);

View File

@ -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;

View File

@ -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);