[libvirt] [PATCH 16/30] conf: drop virCapsPtr param from domain validate callback
None of the impls of this callback require the virCapsPtr param.
Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com>
---
src/conf/domain_conf.c | 4 ++--
src/conf/domain_conf.h | 1 -
src/qemu/qemu_domain.c | 1 -
src/vz/vz_driver.c | 1 -
4 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index ef6c8d3f75..7431aad0cf 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7107,7 +7107,7 @@ virDomainDefValidateInternal(const virDomainDef *def,
*/
int
virDomainDefValidate(virDomainDefPtr def,
- virCapsPtr caps,
+ virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt)
{
@@ -7122,7 +7122,7 @@ virDomainDefValidate(virDomainDefPtr def,
/* call the domain config callback */
if (xmlopt->config.domainValidateCallback &&
- xmlopt->config.domainValidateCallback(def, caps, xmlopt->config.priv) <
0)
+ xmlopt->config.domainValidateCallback(def, xmlopt->config.priv) < 0)
return -1;
/* iterate the devices */
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 9864296be1..bbe73f1182 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2671,7 +2671,6 @@ typedef void (*virDomainDefPostParseDataFree)(void *parseOpaque);
* for configurations that were previously accepted. This shall not modify the
* config. */
typedef int (*virDomainDefValidateCallback)(const virDomainDef *def,
- virCapsPtr caps,
void *opaque);
/* Called once per device, for adjusting per-device settings while
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8ac6a0f842..49b6008d5c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -4972,7 +4972,6 @@ qemuDomainValidateCpuCount(const virDomainDef *def,
static int
qemuDomainDefValidate(const virDomainDef *def,
- virCapsPtr caps G_GNUC_UNUSED,
void *opaque)
{
virQEMUDriverPtr driver = opaque;
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 78aa85825a..35baab1b82 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -259,7 +259,6 @@ vzDomainDefPostParse(virDomainDefPtr def,
static int
vzDomainDefValidate(const virDomainDef *def,
- virCapsPtr caps G_GNUC_UNUSED,
void *opaque)
{
if (vzCheckUnsupportedControllers(def, opaque) < 0)
--
2.23.0