提交 7317a83f 编写于 作者: P Peter Krempa

qemu: command: Fix name of qemuBuildMemoryBackendStr

The function generates JSON properties rather than a string so rename
it.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 07119a2a
...@@ -2936,7 +2936,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, ...@@ -2936,7 +2936,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
/** /**
* qemuBuildMemoryBackendStr: * qemuBuildMemoryBackendProps:
* @backendProps: [out] constructed object * @backendProps: [out] constructed object
* @backendType: [out] type of the backennd used * @backendType: [out] type of the backennd used
* @cfg: qemu driver config object * @cfg: qemu driver config object
...@@ -2962,14 +2962,14 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd, ...@@ -2962,14 +2962,14 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
* -1 on error. * -1 on error.
*/ */
int int
qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
const char **backendType, const char **backendType,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainDefPtr def, virDomainDefPtr def,
virDomainMemoryDefPtr mem, virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset, virBitmapPtr autoNodeset,
bool force) bool force)
{ {
virDomainNumatuneMemMode mode; virDomainNumatuneMemMode mode;
const long system_page_size = virGetSystemPageSizeKB(); const long system_page_size = virGetSystemPageSizeKB();
...@@ -3220,8 +3220,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def, ...@@ -3220,8 +3220,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
mem.targetNode = cell; mem.targetNode = cell;
mem.info.alias = alias; mem.info.alias = alias;
if ((rc = qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps, if ((rc = qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
def, &mem, priv->autoNodeset, false)) < 0) def, &mem, priv->autoNodeset, false)) < 0)
goto cleanup; goto cleanup;
if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType, if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType,
...@@ -3259,8 +3259,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem, ...@@ -3259,8 +3259,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0) if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0)
goto cleanup; goto cleanup;
if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps, if (qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
def, mem, priv->autoNodeset, true) < 0) def, mem, priv->autoNodeset, true) < 0)
goto cleanup; goto cleanup;
ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props); ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props);
......
...@@ -119,14 +119,14 @@ int qemuBuildControllerDevStr(const virDomainDef *domainDef, ...@@ -119,14 +119,14 @@ int qemuBuildControllerDevStr(const virDomainDef *domainDef,
char **devstr, char **devstr,
int *nusbcontroller); int *nusbcontroller);
int qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
const char **backendType, const char **backendType,
virQEMUDriverConfigPtr cfg, virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps, virQEMUCapsPtr qemuCaps,
virDomainDefPtr def, virDomainDefPtr def,
virDomainMemoryDefPtr mem, virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset, virBitmapPtr autoNodeset,
bool force); bool force);
char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem); char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem);
......
...@@ -2142,8 +2142,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver, ...@@ -2142,8 +2142,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
if (!(devstr = qemuBuildMemoryDeviceStr(mem))) if (!(devstr = qemuBuildMemoryDeviceStr(mem)))
goto cleanup; goto cleanup;
if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, if (qemuBuildMemoryBackendProps(&props, &backendType, cfg,
priv->qemuCaps, vm->def, mem, NULL, true) < 0) priv->qemuCaps, vm->def, mem, NULL, true) < 0)
goto cleanup; goto cleanup;
if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0) if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册