]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
Revert "conf: Skip post parse callbacks when creating copy"
authorMichal Privoznik <mprivozn@redhat.com>
Tue, 4 Oct 2016 16:00:02 +0000 (18:00 +0200)
committerMichal Privoznik <mprivozn@redhat.com>
Tue, 4 Oct 2016 16:00:02 +0000 (18:00 +0200)
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 581b7756af18dcf84b57d9947978725d2dfbfc18.

src/conf/domain_conf.c
src/qemu/qemu_domain.c

index 1e65df13928fd6b216a7c6fc897202abbec95ef7..7427efbd3141da25f78cba113b98effea30e8307 100644 (file)
@@ -24684,8 +24684,7 @@ virDomainDefCopy(virDomainDefPtr src,
     virDomainDefPtr ret;
     unsigned int format_flags = VIR_DOMAIN_DEF_FORMAT_SECURE;
     unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE |
-                               VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE |
-                               VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE;
+                               VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE;
 
     if (migratable)
         format_flags |= VIR_DOMAIN_DEF_FORMAT_INACTIVE | VIR_DOMAIN_DEF_FORMAT_MIGRATABLE;
@@ -25172,8 +25171,7 @@ virDomainDeviceDefCopy(virDomainDeviceDefPtr src,
     xmlStr = virBufferContentAndReset(&buf);
     ret = virDomainDeviceDefParse(xmlStr, def, caps, xmlopt,
                                   VIR_DOMAIN_DEF_PARSE_INACTIVE |
-                                  VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE |
-                                  VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE);
+                                  VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
 
  cleanup:
     VIR_FREE(xmlStr);
index 9b1a32ec389783a0e5b9077720ac5024733cf7eb..2b24c01112d1cb1917e052754ffebd77f3abc423 100644 (file)
@@ -3380,8 +3380,7 @@ qemuDomainDefCopy(virQEMUDriverPtr driver,
 
     if (!(ret = virDomainDefParseString(xml, caps, driver->xmlopt, NULL,
                                         VIR_DOMAIN_DEF_PARSE_INACTIVE |
-                                        VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE |
-                                        VIR_DOMAIN_DEF_PARSE_SKIP_POST_PARSE)))
+                                        VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
         goto cleanup;
 
  cleanup: