[qemu-xen staging] hw/arm/virt: Disable memory hotplug when MTE is enabled

[patchbot@xxxxxxx]

commit 19bd6aafbd184be963d2b7c24874e3252a7088b7
Author:     Richard Henderson <richard.henderson@xxxxxxxxxx>
AuthorDate: Mon Jul 20 10:25:36 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Jul 20 11:35:17 2020 +0100

    hw/arm/virt: Disable memory hotplug when MTE is enabled
    
    When MTE is enabled, tag memory must exist for all RAM.
    
    It might be possible to simultaneously hot plug tag memory
    alongside the corresponding normal memory, but for now just
    disable hotplug.
    
    Signed-off-by: Richard Henderson <richard.henderson@xxxxxxxxxx>
    Message-id: 20200713213341.590275-4-richard.henderson@xxxxxxxxxx
    Reviewed-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>
---
 hw/arm/virt.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index a7f3d442db..ecfee362a1 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2194,6 +2194,11 @@ static void virt_memory_pre_plug(HotplugHandler 
*hotplug_dev, DeviceState *dev,
         return;
     }
 
+    if (vms->mte) {
+        error_setg(errp, "memory hotplug is not enabled: MTE is enabled");
+        return;
+    }
+
     if (is_nvdimm && !ms->nvdimms_state->is_enabled) {
         error_setg(errp, "nvdimm is not enabled: add 'nvdimm=on' to '-M'");
         return;
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#staging