[libvirt] [PATCH 18/30] conf: drop virCapsPtr param from domain post parse & validate APIs
Daniel P. Berrangé
berrange at redhat.com
Wed Dec 4 14:21:01 UTC 2019
Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
---
src/conf/domain_conf.c | 10 ++++------
src/conf/domain_conf.h | 2 --
src/libxl/xen_xl.c | 2 +-
src/libxl/xen_xm.c | 2 +-
src/lxc/lxc_native.c | 4 ++--
src/qemu/qemu_driver.c | 12 ++++++------
src/qemu/qemu_process.c | 4 ++--
src/vmx/vmx.c | 4 ++--
8 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 44e56976d9..b1384a1487 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -5802,7 +5802,6 @@ virDomainDefPostParseCheckFailure(virDomainDefPtr def,
int
virDomainDefPostParse(virDomainDefPtr def,
- virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque)
@@ -7107,7 +7106,6 @@ virDomainDefValidateInternal(const virDomainDef *def,
*/
int
virDomainDefValidate(virDomainDefPtr def,
- virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt)
{
@@ -21518,11 +21516,11 @@ virDomainObjParseXML(xmlDocPtr xml,
parseOpaque = xmlopt->privateData.getParseOpaque(obj);
/* callback to fill driver specific domain aspects */
- if (virDomainDefPostParse(obj->def, caps, flags, xmlopt, parseOpaque) < 0)
+ if (virDomainDefPostParse(obj->def, flags, xmlopt, parseOpaque) < 0)
goto error;
/* validate configuration */
- if (virDomainDefValidate(obj->def, caps, flags, xmlopt) < 0)
+ if (virDomainDefValidate(obj->def, flags, xmlopt) < 0)
goto error;
return obj;
@@ -21607,11 +21605,11 @@ virDomainDefParseNode(xmlDocPtr xml,
return NULL;
/* callback to fill driver specific domain aspects */
- if (virDomainDefPostParse(def, caps, flags, xmlopt, parseOpaque) < 0)
+ if (virDomainDefPostParse(def, flags, xmlopt, parseOpaque) < 0)
return NULL;
/* validate configuration */
- if (virDomainDefValidate(def, caps, flags, xmlopt) < 0)
+ if (virDomainDefValidate(def, flags, xmlopt) < 0)
return NULL;
return g_steal_pointer(&def);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index b98fe5eba5..4f3c9fdc8b 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2783,7 +2783,6 @@ virDomainSCSIDriveAddressIsUsed(const virDomainDef *def,
const virDomainDeviceDriveAddress *addr);
int virDomainDefPostParse(virDomainDefPtr def,
- virCapsPtr caps,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt,
void *parseOpaque);
@@ -2796,7 +2795,6 @@ int virDomainDeviceValidateAliasForHotplug(virDomainObjPtr vm,
bool virDomainDeviceAliasIsUserAlias(const char *aliasStr);
int virDomainDefValidate(virDomainDefPtr def,
- virCapsPtr caps,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt);
diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
index 396adf6dac..18ea4a8d95 100644
--- a/src/libxl/xen_xl.c
+++ b/src/libxl/xen_xl.c
@@ -1213,7 +1213,7 @@ xenParseXL(virConfPtr conf,
if (xenParseXLChannel(conf, def) < 0)
goto cleanup;
- if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+ if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0)
goto cleanup;
diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index 88cf9ac5b0..1b462d0487 100644
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -467,7 +467,7 @@ xenParseXM(virConfPtr conf,
if (xenParseXMInputDevs(conf, def) < 0)
goto cleanup;
- if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+ if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0)
goto cleanup;
diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c
index 7e696fd2f0..e9b83653b5 100644
--- a/src/lxc/lxc_native.c
+++ b/src/lxc/lxc_native.c
@@ -1055,7 +1055,7 @@ lxcSetCapDrop(virDomainDefPtr def, virConfPtr properties)
virDomainDefPtr
lxcParseConfigString(const char *config,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
virDomainXMLOptionPtr xmlopt)
{
virDomainDefPtr vmdef = NULL;
@@ -1166,7 +1166,7 @@ lxcParseConfigString(const char *config,
/* lxc.cap.drop */
lxcSetCapDrop(vmdef, properties);
- if (virDomainDefPostParse(vmdef, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+ if (virDomainDefPostParse(vmdef, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0)
goto error;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 93a92dad36..32eae175ed 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -8101,7 +8101,7 @@ qemuCheckDiskConfigAgainstDomain(const virDomainDef *def,
static int
qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
@@ -8301,7 +8301,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
return -1;
}
- if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+ if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1;
return 0;
@@ -8311,7 +8311,7 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef,
static int
qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
@@ -8494,7 +8494,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
return -1;
}
- if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+ if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1;
return 0;
@@ -8503,7 +8503,7 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef,
static int
qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
virDomainDeviceDefPtr dev,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
virQEMUCapsPtr qemuCaps,
unsigned int parse_flags,
virDomainXMLOptionPtr xmlopt)
@@ -8602,7 +8602,7 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef,
return -1;
}
- if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, qemuCaps) < 0)
+ if (virDomainDefPostParse(vmdef, parse_flags, xmlopt, qemuCaps) < 0)
return -1;
return 0;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 79ac5f3d95..33ebdce01e 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -5382,7 +5382,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
* VM that was running before (migration, snapshots, save). It's more
* important to start such VM than keep the configuration clean */
if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
- virDomainDefValidate(vm->def, caps, 0, driver->xmlopt) < 0)
+ virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0)
return -1;
if (qemuProcessStartValidateGraphics(vm) < 0)
@@ -5581,7 +5581,7 @@ qemuProcessInit(virQEMUDriverPtr driver,
VIR_DEBUG("re-running the post parse callback");
/* we don't have the private copy of qemuCaps at this point */
- if (virDomainDefPostParse(vm->def, caps, 0, driver->xmlopt, NULL) < 0)
+ if (virDomainDefPostParse(vm->def, 0, driver->xmlopt, NULL) < 0)
goto cleanup;
}
diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 093092b701..df5eafbd44 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1276,7 +1276,7 @@ virVMXConfigScanResultsCollector(const char* name,
virDomainDefPtr
virVMXParseConfig(virVMXContext *ctx,
virDomainXMLOptionPtr xmlopt,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
const char *vmx)
{
bool success = false;
@@ -1845,7 +1845,7 @@ virVMXParseConfig(virVMXContext *ctx,
}
}
- if (virDomainDefPostParse(def, caps, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
+ if (virDomainDefPostParse(def, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE,
xmlopt, NULL) < 0)
goto cleanup;
--
2.23.0
More information about the libvir-list
mailing list