11:17 a.m.
Everywhere else in qemu driver code 'qemuCaps' is a virQEMUCapsPtr,
and virCapsPtr is generally named just 'caps'. Rename the offenders
---
src/qemu/qemu_parse_command.c | 16 ++++++++--------
src/qemu/qemu_parse_command.h | 4 ++--
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c
index ca59f91..077767e 100644
--- a/src/qemu/qemu_parse_command.c
+++ b/src/qemu/qemu_parse_command.c
@@ -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;
diff --git a/src/qemu/qemu_parse_command.h b/src/qemu/qemu_parse_command.h
index a743189..ed65342 100644
--- a/src/qemu/qemu_parse_command.h
+++ b/src/qemu/qemu_parse_command.h
@@ -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,
--
2.5.0