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 with migration compatibility")

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 hw/core/machine.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/hw/core/machine.c b/hw/core/machine.c
index 4e55119446..e617f7804d 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -40,7 +40,10 @@
 #include "qemu/audio.h"
 #include "hw/arm/smmuv3.h"
 
-GlobalProperty hw_compat_11_1[] = {};
+GlobalProperty hw_compat_11_1[] = {
+    { "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
+    { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
+};
 const size_t hw_compat_11_1_len = G_N_ELEMENTS(hw_compat_11_1);
 
 GlobalProperty hw_compat_11_0[] = {
@@ -54,8 +57,6 @@ GlobalProperty hw_compat_11_0[] = {
     { TYPE_ARM_SMMUV3, "ssidsize", "0" },
     { TYPE_ARM_SMMUV3, "oas", "44" },
     { "migration", "switchover-ack-legacy", "on" },
-    { "sysbus-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
-    { "pci-ehci-usb", "x-migrate-fetch-addr-64bit", "off" },
 };
 const size_t hw_compat_11_0_len = G_N_ELEMENTS(hw_compat_11_0);
 
-- 
2.43.0

On 14/8/26 05:26, Jamin Lin wrote:
> 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 with migration compatibility")
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   hw/core/machine.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)

Queued, thanks.

On 14/8/26 05:26, Jamin Lin wrote:
> 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 with migration compatibility")
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   hw/core/machine.c | 7 ++++---
>   1 file changed, 4 insertions(+), 3 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>