[libvirt] [PATCH 14/30] conf: drop virCapsPtr param from post parse callback

No impl of this callback requires the virCapsPtr anymore. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/bhyve/bhyve_domain.c | 1 - src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 1 - src/libxl/libxl_domain.c | 1 - src/lxc/lxc_domain.c | 1 - src/openvz/openvz_conf.c | 1 - src/phyp/phyp_driver.c | 1 - src/qemu/qemu_domain.c | 1 - src/vmware/vmware_driver.c | 1 - src/vmx/vmx.c | 1 - src/vz/vz_driver.c | 1 - 11 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index a321be54f4..c8d33b4e00 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -75,7 +75,6 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def) static int bhyveDomainDefPostParse(virDomainDefPtr def, - virCapsPtr _caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 164c313ac6..f2452f6df2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5849,7 +5849,7 @@ virDomainDefPostParse(virDomainDefPtr def, /* call the domain config callback */ if (xmlopt->config.domainPostParseCallback) { - ret = xmlopt->config.domainPostParseCallback(def, caps, parseFlags, + ret = xmlopt->config.domainPostParseCallback(def, parseFlags, xmlopt->config.priv, data.parseOpaque); if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 86d0b47a66..7a5bfd00ed 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2638,7 +2638,6 @@ typedef int (*virDomainDefPostParseBasicCallback)(virDomainDefPtr def, * value and the failure is noted in def->postParseFailed. Drivers should then * re-run the post parse callback when attempting to use such definition. */ typedef int (*virDomainDefPostParseCallback)(virDomainDefPtr def, - virCapsPtr caps, unsigned int parseFlags, void *opaque, void *parseOpaque); diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index dfac04bf59..2524d17eb4 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -367,7 +367,6 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, static int libxlDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index bc54beeadf..8b27bc95af 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -351,7 +351,6 @@ virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDataCallbacks = { static int virLXCDomainDefPostParse(virDomainDefPtr def, - virCapsPtr _caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 5060e704a5..5057f9652e 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -1082,7 +1082,6 @@ int openvzGetVEID(const char *name) static int openvzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 05860b7dbe..3c809378c3 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1062,7 +1062,6 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth, static int phypDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 70683eb83a..6aa50dda0b 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4694,7 +4694,6 @@ qemuDomainDefPostParseBasic(virDomainDefPtr def, static int qemuDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 308a941f8a..301f43d9e8 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -117,7 +117,6 @@ vmwareDataFreeFunc(void *data) static int vmwareDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 958b168891..3f8324ce89 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -530,7 +530,6 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, static int virVMXDomainDefPostParse(virDomainDefPtr def, - virCapsPtr _caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index a0d1efb9dd..f54bdd49db 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -241,7 +241,6 @@ vzDomainDefAddDefaultInputDevices(virDomainDefPtr def) static int vzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque G_GNUC_UNUSED) -- 2.23.0