External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-30 13:37:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: parse: rename qemuCaps->caps

Browse Source 
Everywhere else in qemu driver code 'qemuCaps' is a virQEMUCapsPtr,
and virCapsPtr is generally named just 'caps'. Rename the offenders
This commit is contained in:
Cole Robinson 2016-02-17 11:37:03 -05:00
parent 4066c73428
commit 378a9dc6b7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/qemu/qemu_parse_command.c
View File

@ -1721,7 +1721,7 @@ qemuParseCommandLineBootDevs(virDomainDefPtr def, const char *str)
* as is practical. This is not an exact science....
*/
static virDomainDefPtr
qemuParseCommandLine(virCapsPtr qemuCaps,
qemuParseCommandLine(virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
char **progenv,
char **progargv,
@ -1796,7 +1796,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
}
if (def->virtType == VIR_DOMAIN_VIRT_KVM)
def->os.arch = qemuCaps->host.arch;
def->os.arch = caps->host.arch;
else if (STRPREFIX(path, "qemu-system-"))
def->os.arch = virArchFromString(path + strlen("qemu-system-"));
else
@ -2522,7 +2522,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
if (!def->os.machine) {
virCapsDomainDataPtr capsdata;
if (!(capsdata = virCapabilitiesDomainDataLookup(qemuCaps, def->os.type,
if (!(capsdata = virCapabilitiesDomainDataLookup(caps, def->os.type,
def->os.arch, def->virtType, NULL, NULL)))
goto error;
@ -2597,7 +2597,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
if (virDomainDefAddImplicitControllers(def) < 0)
goto error;
if (virDomainDefPostParse(def, qemuCaps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt) < 0)
goto error;
@ -2626,7 +2626,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
}
virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
virDomainDefPtr qemuParseCommandLineString(virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
const char *args,
char **pidfile,
@ -2640,7 +2640,7 @@ virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
if (qemuStringToArgvEnv(args, &progenv, &progargv) < 0)
goto cleanup;
def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv,
def = qemuParseCommandLine(caps, xmlopt, progenv, progargv,
pidfile, monConfig, monJSON);
cleanup:
@ -2698,7 +2698,7 @@ static int qemuParseProcFileStrings(int pid_value,
return ret;
}
virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
pid_t pid,
char **pidfile,
@ -2718,7 +2718,7 @@ virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
qemuParseProcFileStrings(pid, "environ", &progenv) < 0)
goto cleanup;
if (!(def = qemuParseCommandLine(qemuCaps, xmlopt, progenv, progargv,
if (!(def = qemuParseCommandLine(caps, xmlopt, progenv, progargv,
pidfile, monConfig, monJSON)))
goto cleanup;

4
src/qemu/qemu_parse_command.h
View File

@ -30,13 +30,13 @@
* NB: def->name can be NULL upon return and the caller
* *must* decide how to fill in a name in this case
*/
virDomainDefPtr qemuParseCommandLineString(virCapsPtr qemuCaps,
virDomainDefPtr qemuParseCommandLineString(virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
const char *args,
char **pidfile,
virDomainChrSourceDefPtr *monConfig,
bool *monJSON);
virDomainDefPtr qemuParseCommandLinePid(virCapsPtr qemuCaps,
virDomainDefPtr qemuParseCommandLinePid(virCapsPtr caps,
virDomainXMLOptionPtr xmlopt,
pid_t pid,
char **pidfile,