@samitouri / QOSamiQemu / commits / b409523587

hw/core/machine: Move EHCI migration compat properties to 11.1

The x-migrate-fetch-addr-64bit compatibility properties for sysbus-ehci-usb and pci-ehci-usb were reviewed before the QEMU 11.1 release and were therefore initially added to hw_compat_11_0. However, the EHCI migration change was merged after the QEMU 11.1 release. As a result, these compatibility properties belong in hw_compat_11_1 rather than hw_compat_11_0. Move both properties to hw_compat_11_1 so that migration compatibility is associated with the correct machine version. Fixes: 38ed803aebb2 ("usb/hcd-ehci: Change descriptor addresses to 64-bit") Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com> Message-ID: <20260814032559.3381363-1-jamin_lin@aspeedtech.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>

Jamin Lin committed Aug 14, 2026 at 03:26 UTC b409523587c49a08b1ddadd51212a320092347b1
1 file changed +4 -3
hw/core/machine.c
+4 -3
@@ -40,7 +40,10 @@
40 #include "qemu/audio.h"
41 #include "hw/arm/smmuv3.h"
42
43 -GlobalProperty hw_compat_11_1[] = {};
43 +GlobalProperty hw_compat_11_1[] = {
44 + { "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
45 + { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
46 +};
47 const size_t hw_compat_11_1_len = G_N_ELEMENTS(hw_compat_11_1);
48
49 GlobalProperty hw_compat_11_0[] = {
@@ -54,8 +57,6 @@ GlobalProperty hw_compat_11_0[] = {
57 { TYPE_ARM_SMMUV3, "ssidsize", "0" },
58 { TYPE_ARM_SMMUV3, "oas", "44" },
59 { "migration", "switchover-ack-legacy", "on" },
57 - { "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
58 - { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
60 };
61 const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0);
62