On 13/06/21 12:40, Mark Cave-Ayland wrote:
Unfortunately the VMSTATE_*_V() macros don't work in ESPState because
ESPState is currently embedded in both sysbusespscsi and pciespscsi
using VMSTATE_STRUCT() where the version of the vmstate_esp
VMStateDescription does not match those in the vmstate_sysbus_esp_scsi
or vmstate_esp_pci_scsi VMStateDescriptions. This is currently handled
by adding an explicit mig_version_id field containing the
vmstate_esp.version_id field and testing accordingly.
The fix is to use the same logic as esp_is_version_5() when adding the
new field to vmstate_esp. I've tested the changes below squashed into
your patch, along with the just posted fix for esp_is_version_5(), and
confirmed that I can reload old qemu-system-sparc images from 5.2 and
6.0 as well as git master.
Ah, ok. So I'll squash this fix, thanks!
Paolo
