External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-02 09:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: command: Fix name of qemuBuildMemoryBackendStr

Browse Source 
The function generates JSON properties rather than a string so rename
it.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa 2018-05-18 15:51:36 +02:00
parent 07119a2a6a
commit 7317a83f60
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qemu/qemu_command.c
View File

@ -2936,7 +2936,7 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
/**
* qemuBuildMemoryBackendStr:
* qemuBuildMemoryBackendProps:
* @backendProps: [out] constructed object
* @backendType: [out] type of the backennd used
* @cfg: qemu driver config object
@ -2962,14 +2962,14 @@ qemuBuildControllerDevCommandLine(virCommandPtr cmd,
* -1 on error.
*/
int
qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,
const char **backendType,
virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr def,
virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset,
bool force)
qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
const char **backendType,
virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr def,
virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset,
bool force)
{
virDomainNumatuneMemMode mode;
const long system_page_size = virGetSystemPageSizeKB();
@ -3220,8 +3220,8 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
mem.targetNode = cell;
mem.info.alias = alias;
if ((rc = qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
def, &mem, priv->autoNodeset, false)) < 0)
if ((rc = qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
def, &mem, priv->autoNodeset, false)) < 0)
goto cleanup;
if (!(*backendStr = virQEMUBuildObjectCommandlineFromJSON(backendType,
@ -3259,8 +3259,8 @@ qemuBuildMemoryDimmBackendStr(virDomainMemoryDefPtr mem,
if (virAsprintf(&alias, "mem%s", mem->info.alias) < 0)
goto cleanup;
if (qemuBuildMemoryBackendStr(&props, &backendType, cfg, priv->qemuCaps,
def, mem, priv->autoNodeset, true) < 0)
if (qemuBuildMemoryBackendProps(&props, &backendType, cfg, priv->qemuCaps,
def, mem, priv->autoNodeset, true) < 0)
goto cleanup;
ret = virQEMUBuildObjectCommandlineFromJSON(backendType, alias, props);

16
src/qemu/qemu_command.h
View File

@ -119,14 +119,14 @@ int qemuBuildControllerDevStr(const virDomainDef *domainDef,
char **devstr,
int *nusbcontroller);
int qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps,
const char **backendType,
virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr def,
virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset,
bool force);
int qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
const char **backendType,
virQEMUDriverConfigPtr cfg,
virQEMUCapsPtr qemuCaps,
virDomainDefPtr def,
virDomainMemoryDefPtr mem,
virBitmapPtr autoNodeset,
bool force);
char *qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem);

4
src/qemu/qemu_hotplug.c
View File

@ -2142,8 +2142,8 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
if (!(devstr = qemuBuildMemoryDeviceStr(mem)))
goto cleanup;
if (qemuBuildMemoryBackendStr(&props, &backendType, cfg,
priv->qemuCaps, vm->def, mem, NULL, true) < 0)
if (qemuBuildMemoryBackendProps(&props, &backendType, cfg,
priv->qemuCaps, vm->def, mem, NULL, true) < 0)
goto cleanup;
if (qemuProcessBuildDestroyMemoryPaths(driver, vm, mem, true) < 0)