From a7ef72a8fd56ec9dfa38a2e7fce54e795aca2792 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 26 Nov 2019 16:53:53 +0000 Subject: [PATCH] conf: drop virCapsPtr param from assign addresses callback MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The virCapsPtr param is not used by any of the virt drivers providing this callback. Reviewed-by: Michal Privoznik Signed-off-by: Daniel P. Berrangé --- src/bhyve/bhyve_domain.c | 1 - src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 1 - src/qemu/qemu_domain.c | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index eebf5a7650..a321be54f4 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -167,7 +167,6 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, static int bhyveDomainDefAssignAddresses(virDomainDef *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/conf/domain_conf.c b/src/conf/domain_conf.c index a793aa186a..b1685a2852 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5878,7 +5878,7 @@ virDomainDefPostParse(virDomainDefPtr def, goto cleanup; if (xmlopt->config.assignAddressesCallback) { - ret = xmlopt->config.assignAddressesCallback(def, caps, parseFlags, + ret = xmlopt->config.assignAddressesCallback(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 7e75ef83d4..09a3626464 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2660,7 +2660,6 @@ typedef int (*virDomainDeviceDefPostParseCallback)(virDomainDeviceDefPtr dev, * @opaque is opaque data set by driver (usually pointer to driver * private data). */ typedef int (*virDomainDefAssignAddressesCallback)(virDomainDef *def, - virCapsPtr caps, unsigned int parseFlags, void *opaque, void *parseOpaque); diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 6159101bcc..461fadc3d7 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8115,7 +8115,6 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, static int qemuDomainDefAssignAddresses(virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque) -- 2.47.2