[libvirt] [PATCH v2 3/3] virQEMUDriverDomainABIStability: Check for memoryBacking
https://bugzilla.redhat.com/show_bug.cgi?id=1450349
Problem is, qemu fails to load guest memory image if these
attribute change on migration/restore from an image.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/libvirt_private.syms | 6 ++++++
src/qemu/qemu_conf.c | 2 +-
src/qemu/qemu_domain.c | 40 ++++++++++++++++++++++++++++++++++++++++
src/qemu/qemu_domain.h | 1 +
4 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index d361454d5..a3ed2ad5b 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -404,11 +404,15 @@ virDomainLockFailureTypeFromString;
virDomainLockFailureTypeToString;
virDomainMemballoonModelTypeFromString;
virDomainMemballoonModelTypeToString;
+virDomainMemoryAllocationTypeFromString;
+virDomainMemoryAllocationTypeToString;
virDomainMemoryDefFree;
virDomainMemoryFindByDef;
virDomainMemoryFindInactiveByDef;
virDomainMemoryInsert;
virDomainMemoryRemove;
+virDomainMemorySourceTypeFromString;
+virDomainMemorySourceTypeToString;
virDomainNetAppendIPAddress;
virDomainNetDefClear;
virDomainNetDefFormat;
@@ -690,6 +694,8 @@ virNodeDeviceEventUpdateNew;
# conf/numa_conf.h
+virDomainMemoryAccessTypeFromString;
+virDomainMemoryAccessTypeToString;
virDomainNumaCheckABIStability;
virDomainNumaEquals;
virDomainNumaFree;
diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index 78f55c0e7..d8b88386d 100644
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -910,7 +910,7 @@ virQEMUDriverCreateXMLConf(virQEMUDriverPtr driver)
return virDomainXMLOptionNew(&virQEMUDriverDomainDefParserConfig,
&virQEMUDriverPrivateDataCallbacks,
&virQEMUDriverDomainXMLNamespace,
- NULL);
+ &virQEMUDriverDomainABIStability);
}
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 35fd79de8..c1ff8ca8a 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -5797,6 +5797,46 @@ qemuDomainUpdateMemoryDeviceInfo(virQEMUDriverPtr driver,
}
+static bool
+qemuDomainABIStabilityCheck(const virDomainDef *src,
+ const virDomainDef *dst)
+{
+ if (src->mem.source != dst->mem.source) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target memoryBacking source '%s' doesn't
"
+ "match source memoryBacking source'%s'"),
+ virDomainMemorySourceTypeToString(dst->mem.source),
+ virDomainMemorySourceTypeToString(src->mem.source));
+ return false;
+ }
+
+ if (src->mem.access != dst->mem.access) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target memoryBacking access '%s' doesn't
"
+ "match access memoryBacking access'%s'"),
+ virDomainMemoryAccessTypeToString(dst->mem.access),
+ virDomainMemoryAccessTypeToString(src->mem.access));
+ return false;
+ }
+
+ if (src->mem.allocation != dst->mem.allocation) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+ _("Target memoryBacking allocation '%s' doesn't
"
+ "match allocation memoryBacking
allocation'%s'"),
+ virDomainMemoryAllocationTypeToString(dst->mem.allocation),
+ virDomainMemoryAllocationTypeToString(src->mem.allocation));
+ return false;
+ }
+
+ return true;
+}
+
+
+virDomainABIStability virQEMUDriverDomainABIStability = {
+ .domain = qemuDomainABIStabilityCheck,
+};
+
+
bool
qemuDomainDefCheckABIStability(virQEMUDriverPtr driver,
virDomainDefPtr src,
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index aebd91ad3..829f7746e 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -636,6 +636,7 @@ void qemuDomainCleanupRun(virQEMUDriverPtr driver,
extern virDomainXMLPrivateDataCallbacks virQEMUDriverPrivateDataCallbacks;
extern virDomainXMLNamespace virQEMUDriverDomainXMLNamespace;
extern virDomainDefParserConfig virQEMUDriverDomainDefParserConfig;
+extern virDomainABIStability virQEMUDriverDomainABIStability;
int qemuDomainUpdateDeviceList(virQEMUDriverPtr driver,
virDomainObjPtr vm, int asyncJob);
--
2.13.0