From: Dr. David Alan Gilbert Date: Thu, 30 Jan 2020 17:50:46 +0000 (+0000) Subject: machine/memory encryption: Disable mem merge X-Git-Tag: v5.0.0-rc3~60^2~7 X-Git-Url: https://git.proxmox.com/?p=mirror_qemu.git;a=commitdiff_plain;h=4ba59be1d6d8c57941841a505cb4656628d582d0 machine/memory encryption: Disable mem merge When a host is running with memory encryption, the memory isn't visible to the host kernel; attempts to merge that memory are futile because what it's really comparing is encrypted memory, usually encrypted with different keys. Automatically turn mem-merge off when memory encryption is specified. https://bugzilla.redhat.com/show_bug.cgi?id=1796356 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20200130175046.85850-1-dgilbert@redhat.com> Signed-off-by: Eduardo Habkost --- diff --git a/hw/core/machine.c b/hw/core/machine.c index 9e8c06036f..4778bc6b08 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -425,6 +425,14 @@ static void machine_set_memory_encryption(Object *obj, const char *value, g_free(ms->memory_encryption); ms->memory_encryption = g_strdup(value); + + /* + * With memory encryption, the host can't see the real contents of RAM, + * so there's no point in it trying to merge areas. + */ + if (value) { + machine_set_mem_merge(obj, false, errp); + } } static bool machine_get_nvdimm(Object *obj, Error **errp)