From 227a0503e2bd876a35a65faf25e5289e864f14a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 26 Nov 2019 16:53:53 +0000 Subject: [PATCH] conf: drop virCapsPtr param from post parse data alloc callback MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The only user of this callback did not require the virCapsPtr parameter. Reviewed-by: Michal Privoznik Signed-off-by: Daniel P. Berrangé --- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 1 - src/qemu/qemu_domain.c | 1 - 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b59b43f33d..7512d407d9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5506,7 +5506,7 @@ virDomainDeviceDefPostParseOne(virDomainDeviceDefPtr dev, int ret; if (!parseOpaque && xmlopt->config.domainPostParseDataAlloc) { - if (xmlopt->config.domainPostParseDataAlloc(def, caps, flags, + if (xmlopt->config.domainPostParseDataAlloc(def, flags, xmlopt->config.priv, &data) < 0) return -1; @@ -5841,7 +5841,7 @@ virDomainDefPostParse(virDomainDefPtr def, if (!data.parseOpaque && xmlopt->config.domainPostParseDataAlloc) { - ret = xmlopt->config.domainPostParseDataAlloc(def, caps, parseFlags, + ret = xmlopt->config.domainPostParseDataAlloc(def, parseFlags, xmlopt->config.priv, &data.parseOpaque); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bbce0a2059..6eb16760be 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2664,7 +2664,6 @@ typedef int (*virDomainDefAssignAddressesCallback)(virDomainDef *def, void *parseOpaque); typedef int (*virDomainDefPostParseDataAlloc)(const 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 45c4ca3995..5fa9409a3f 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -8142,7 +8142,6 @@ qemuDomainDefAssignAddresses(virDomainDef *def, static int qemuDomainPostParseDataAlloc(const virDomainDef *def, - virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void **parseOpaque)