[libvirt] [PATCH 01/15] qemu: Rename qemuDomainCmdlineDefPtr to qemuDomainXmlNsDefPtr
The data injected via the namespace may contain also other things than
commandline passthrough definitions. Rename it to make it more
universal.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 16 ++++++++--------
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_conf.h | 8 ++++----
src/qemu/qemu_domain.c | 12 ++++++------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 59dc134785..637de74e90 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -10881,14 +10881,14 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
virCommandAddArgList(cmd, "-loadvm", snapshot->def->name, NULL);
if (def->namespaceData) {
- qemuDomainCmdlineDefPtr qemucmd;
-
- qemucmd = def->namespaceData;
- for (i = 0; i < qemucmd->num_args; i++)
- virCommandAddArg(cmd, qemucmd->args[i]);
- for (i = 0; i < qemucmd->num_env; i++)
- virCommandAddEnvPair(cmd, qemucmd->env_name[i],
- NULLSTR_EMPTY(qemucmd->env_value[i]));
+ qemuDomainXmlNsDefPtr qemuxmlns;
+
+ qemuxmlns = def->namespaceData;
+ for (i = 0; i < qemuxmlns->num_args; i++)
+ virCommandAddArg(cmd, qemuxmlns->args[i]);
+ for (i = 0; i < qemuxmlns->num_env; i++)
+ virCommandAddEnvPair(cmd, qemuxmlns->env_name[i],
+ NULLSTR_EMPTY(qemuxmlns->env_value[i]));
}
if (qemuBuildSeccompSandboxCommandLine(cmd, cfg, qemuCaps) < 0)
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index daea11dacb..afff77b1f3 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -94,7 +94,7 @@ qemuDriverUnlock(virQEMUDriverPtr driver)
virMutexUnlock(&driver->lock);
}
-void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def)
+void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def)
{
size_t i;
diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
index 983e74a3cf..26aa96f194 100644
--- a/src/qemu/qemu_conf.h
+++ b/src/qemu/qemu_conf.h
@@ -297,9 +297,9 @@ struct _virQEMUDriver {
virHashAtomicPtr migrationErrors;
};
-typedef struct _qemuDomainCmdlineDef qemuDomainCmdlineDef;
-typedef qemuDomainCmdlineDef *qemuDomainCmdlineDefPtr;
-struct _qemuDomainCmdlineDef {
+typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef;
+typedef qemuDomainXmlNsDef *qemuDomainXmlNsDefPtr;
+struct _qemuDomainXmlNsDef {
size_t num_args;
char **args;
@@ -310,7 +310,7 @@ struct _qemuDomainCmdlineDef {
-void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def);
+void qemuDomainXmlNsDefFree(qemuDomainXmlNsDefPtr def);
virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged);
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8262107311..10215ffa47 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3094,9 +3094,9 @@ virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks =
{
static void
qemuDomainDefNamespaceFree(void *nsdata)
{
- qemuDomainCmdlineDefPtr cmd = nsdata;
+ qemuDomainXmlNsDefPtr cmd = nsdata;
- qemuDomainCmdlineDefFree(cmd);
+ qemuDomainXmlNsDefFree(cmd);
}
static int
@@ -3105,7 +3105,7 @@ qemuDomainDefNamespaceParse(xmlDocPtr xml ATTRIBUTE_UNUSED,
xmlXPathContextPtr ctxt,
void **data)
{
- qemuDomainCmdlineDefPtr cmd = NULL;
+ qemuDomainXmlNsDefPtr cmd = NULL;
bool uses_qemu_ns = false;
xmlNodePtr *nodes = NULL;
int n;
@@ -3205,7 +3205,7 @@ static int
qemuDomainDefNamespaceFormatXML(virBufferPtr buf,
void *nsdata)
{
- qemuDomainCmdlineDefPtr cmd = nsdata;
+ qemuDomainXmlNsDefPtr cmd = nsdata;
size_t i;
if (!cmd->num_args && !cmd->num_env)
@@ -8182,8 +8182,8 @@ void qemuDomainObjCheckTaint(virQEMUDriverPtr driver,
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_HOOK, logCtxt);
if (obj->def->namespaceData) {
- qemuDomainCmdlineDefPtr qemucmd = obj->def->namespaceData;
- if (qemucmd->num_args || qemucmd->num_env)
+ qemuDomainXmlNsDefPtr qemuxmlns = obj->def->namespaceData;
+ if (qemuxmlns->num_args || qemuxmlns->num_env)
qemuDomainObjTaint(driver, obj, VIR_DOMAIN_TAINT_CUSTOM_ARGV, logCtxt);
}
--
2.21.0