|
 |
6d3351 |
From b24b004e1196889201142d1fc7d51e2fafdbe328 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <b24b004e1196889201142d1fc7d51e2fafdbe328@dist-git>
|
|
|
6d3351 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
Date: Thu, 20 Apr 2017 09:16:20 +0200
|
|
|
6d3351 |
Subject: [PATCH] conf: add a new parse flag
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION
|
|
|
6d3351 |
|
|
|
6d3351 |
So far there is probably no change that is allowed to be done
|
|
|
6d3351 |
by the VIR_DOMAIN_DEF_PARSE_ABI_UPDATE flag that would break
|
|
|
6d3351 |
guest ABI but this may change in the future.
|
|
|
6d3351 |
|
|
|
6d3351 |
This introduces new VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION
|
|
|
6d3351 |
which should be used only for ABI updates that are "safe" for
|
|
|
6d3351 |
persistent migration.
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
(cherry picked from commit 5c7d88085a762cf4ecc9416a3b7581fa45738c2a)
|
|
|
6d3351 |
|
|
|
6d3351 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1373184
|
|
|
6d3351 |
|
|
|
6d3351 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/conf/domain_conf.c | 3 ++-
|
|
|
6d3351 |
src/conf/domain_conf.h | 4 ++++
|
|
|
6d3351 |
src/qemu/qemu_migration_cookie.c | 2 +-
|
|
|
6d3351 |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
6d3351 |
index 1b0a55b27..71f0c95c3 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.c
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.c
|
|
|
6d3351 |
@@ -3805,7 +3805,8 @@ virDomainDefPostParseMemory(virDomainDefPtr def,
|
|
|
6d3351 |
/* Attempt to infer the initial memory size from the sum NUMA memory sizes
|
|
|
6d3351 |
* in case ABI updates are allowed or the <memory> element wasn't specified */
|
|
|
6d3351 |
if (def->mem.total_memory == 0 ||
|
|
|
6d3351 |
- parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE)
|
|
|
6d3351 |
+ parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE ||
|
|
|
6d3351 |
+ parseFlags & VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION)
|
|
|
6d3351 |
numaMemory = virDomainNumaGetMemorySize(def->numa);
|
|
|
6d3351 |
|
|
|
6d3351 |
/* calculate the sizes of hotplug memory */
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
6d3351 |
index 47eaacef3..71e651975 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.h
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.h
|
|
|
6d3351 |
@@ -2725,6 +2725,10 @@ typedef enum {
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE = 1 << 10,
|
|
|
6d3351 |
/* skip parsing of security labels */
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_SKIP_SECLABEL = 1 << 11,
|
|
|
6d3351 |
+ /* Allows updates in post parse callback for incoming persistent migration
|
|
|
6d3351 |
+ * that would break ABI otherwise. This should be used only if it's safe
|
|
|
6d3351 |
+ * to do such change. */
|
|
|
6d3351 |
+ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION = 1 << 12,
|
|
|
6d3351 |
} virDomainDefParseFlags;
|
|
|
6d3351 |
|
|
|
6d3351 |
typedef enum {
|
|
|
6d3351 |
diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
|
|
|
6d3351 |
index bd12f1124..12887892d 100644
|
|
|
6d3351 |
--- a/src/qemu/qemu_migration_cookie.c
|
|
|
6d3351 |
+++ b/src/qemu/qemu_migration_cookie.c
|
|
|
6d3351 |
@@ -1173,7 +1173,7 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig,
|
|
|
6d3351 |
mig->persistent = virDomainDefParseNode(doc, nodes[0],
|
|
|
6d3351 |
caps, driver->xmlopt, NULL,
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_INACTIVE |
|
|
|
6d3351 |
- VIR_DOMAIN_DEF_PARSE_ABI_UPDATE |
|
|
|
6d3351 |
+ VIR_DOMAIN_DEF_PARSE_ABI_UPDATE_MIGRATION |
|
|
|
6d3351 |
VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE);
|
|
|
6d3351 |
if (!mig->persistent) {
|
|
|
6d3351 |
/* virDomainDefParseNode already reported
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.12.2
|
|
|
6d3351 |
|