From ddc8bc1cf4bd1f1307d1c74638d610571e55c569 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Tue, 4 Oct 2016 17:58:21 +0200 Subject: [PATCH] Revert "domain_conf: Introduce VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE" This breaks vCPU hotplug, because when starting a domain, we create a copy of domain definition (which becomes live XML) and during the post parse callbacks we might adjust some tunings so that vCPU hotplug is possible. This reverts commit c0f90799bc7fa4b690ead6a592806378a243873c. --- src/conf/domain_conf.c | 6 ------ src/conf/domain_conf.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 920529a76d..1e65df1392 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4430,9 +4430,6 @@ virDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, { int ret; - if (flags & VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE) - return 0; - if (xmlopt->config.devicesPostParseCallback) { ret = xmlopt->config.devicesPostParseCallback(dev, def, caps, flags, xmlopt->config.priv, @@ -4582,9 +4579,6 @@ virDomainDefPostParse(virDomainDefPtr def, .parseOpaque = parseOpaque, }; - if (parseFlags & VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE) - return 0; - /* this must be done before the hypervisor-specific callback, * in case presence of a controller at a specific index is checked */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fd3ae8e500..a70bc2182a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2647,8 +2647,6 @@ typedef enum { VIR_DOMAIN_DEF_PARSE_ABI_UPDATE = 1 << 9, /* skip definition validation checks meant to be executed on define time only */ VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE = 1 << 10, - /* skip post parse callback */ - VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE = 1 << 11, } virDomainDefParseFlags; typedef enum { -- GitLab