提交 04c960dd 编写于 作者: D Daniel P. Berrangé

conf: drop virCapsPtr param from domain validate callback

None of the impls of this callback require the virCapsPtr param.
Reviewed-by: NMichal Privoznik <mprivozn@redhat.com>
Signed-off-by: NDaniel P. Berrangé <berrange@redhat.com>
上级 33b62676
...@@ -7115,7 +7115,7 @@ virDomainDefValidateInternal(const virDomainDef *def, ...@@ -7115,7 +7115,7 @@ virDomainDefValidateInternal(const virDomainDef *def,
*/ */
int int
virDomainDefValidate(virDomainDefPtr def, virDomainDefValidate(virDomainDefPtr def,
virCapsPtr caps, virCapsPtr caps G_GNUC_UNUSED,
unsigned int parseFlags, unsigned int parseFlags,
virDomainXMLOptionPtr xmlopt) virDomainXMLOptionPtr xmlopt)
{ {
...@@ -7130,7 +7130,7 @@ virDomainDefValidate(virDomainDefPtr def, ...@@ -7130,7 +7130,7 @@ virDomainDefValidate(virDomainDefPtr def,
/* call the domain config callback */ /* call the domain config callback */
if (xmlopt->config.domainValidateCallback && if (xmlopt->config.domainValidateCallback &&
xmlopt->config.domainValidateCallback(def, caps, xmlopt->config.priv) < 0) xmlopt->config.domainValidateCallback(def, xmlopt->config.priv) < 0)
return -1; return -1;
/* iterate the devices */ /* iterate the devices */
......
...@@ -2671,7 +2671,6 @@ typedef void (*virDomainDefPostParseDataFree)(void *parseOpaque); ...@@ -2671,7 +2671,6 @@ typedef void (*virDomainDefPostParseDataFree)(void *parseOpaque);
* for configurations that were previously accepted. This shall not modify the * for configurations that were previously accepted. This shall not modify the
* config. */ * config. */
typedef int (*virDomainDefValidateCallback)(const virDomainDef *def, typedef int (*virDomainDefValidateCallback)(const virDomainDef *def,
virCapsPtr caps,
void *opaque); void *opaque);
/* Called once per device, for adjusting per-device settings while /* Called once per device, for adjusting per-device settings while
......
...@@ -4972,7 +4972,6 @@ qemuDomainValidateCpuCount(const virDomainDef *def, ...@@ -4972,7 +4972,6 @@ qemuDomainValidateCpuCount(const virDomainDef *def,
static int static int
qemuDomainDefValidate(const virDomainDef *def, qemuDomainDefValidate(const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
virQEMUDriverPtr driver = opaque; virQEMUDriverPtr driver = opaque;
......
...@@ -259,7 +259,6 @@ vzDomainDefPostParse(virDomainDefPtr def, ...@@ -259,7 +259,6 @@ vzDomainDefPostParse(virDomainDefPtr def,
static int static int
vzDomainDefValidate(const virDomainDef *def, vzDomainDefValidate(const virDomainDef *def,
virCapsPtr caps G_GNUC_UNUSED,
void *opaque) void *opaque)
{ {
if (vzCheckUnsupportedControllers(def, opaque) < 0) if (vzCheckUnsupportedControllers(def, opaque) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册