[BUG]The latest qemu crashed when I tested cxl

[BUG]The latest qemu crashed when I tested cxl

[Song Dom]

[-- Attachment #1: Type: text/plain, Size: 917 bytes --]

I test cxl with the patch:[v11,0/2] arm/virt: CXL support via pxb_cxl.
https://patchwork.kernel.org/project/cxl/cover/20220616141950.23374-1-Jonathan.Cameron@huawei.com/

But the qemu crashed,and showing an error:
qemu-system-aarch64: ../hw/arm/virt.c:1735: virt_get_high_memmap_enabled: Assertion `ARRAY_SIZE(extended_memmap) - VIRT_LOWMEMMAP_LAST == ARRAY_SIZE(enabled_array)' failed.

Then I modify the patch to fix the bug:
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ea2413a0ba..3d4cee3491 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1710,6 +1730,7 @@ static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms,
         &vms->highmem_redists,
         &vms->highmem_ecam,
         &vms->highmem_mmio,
+ &vms->cxl_devices_state.is_enabled,
     };
Now qemu works good.

Could you tell me when the patch(arm/virt: CXL support via pxb_cxl) will be merged into upstream?

[-- Attachment #2: Type: text/html, Size: 4261 bytes --]