hw/core/machine: Move EHCI migration compat properties to 11.1
PATCH 1/1 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.
--- hw/core/machine.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
hw/core/machine.c +4 -3
@@ -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);
Signature · 1 line
2.43.0
Quoted 11 lines · Jamin Lin
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_1rather thanhw_compat_11_0.Move both properties to
hw_compat_11_1so that migration compatibility is associated with the correct machine version.
Quoted 6 lines
Fixes 38ed803aebb2 ("usb/hcd-ehci: Change descriptor addresses to 64-bit with migration compatibility")Signed-off-by Jamin Lin <[email protected]>--- hw/core/machine.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Philippe Mathieu-Daudé
AppliedQuoted 11 lines · Jamin Lin
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_1rather thanhw_compat_11_0.Move both properties to
hw_compat_11_1so that migration compatibility is associated with the correct machine version.
Quoted 6 lines
Fixes 38ed803aebb2 ("usb/hcd-ehci: Change descriptor addresses to 64-bit with migration compatibility")Signed-off-by Jamin Lin <[email protected]>--- hw/core/machine.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
Queued, thanks.