]> Git Repo - qemu.git/commit
esp: add vmstate_esp version to embedded ESPState
authorMark Cave-Ayland <[email protected]>
Thu, 4 Mar 2021 22:10:25 +0000 (22:10 +0000)
committerMark Cave-Ayland <[email protected]>
Sun, 7 Mar 2021 10:39:05 +0000 (10:39 +0000)
commit0bd005be782d9492afe3cc6fc494d8c3b477e5b8
tree934a3b98e8d92410f08af9b4c5e025b3060369b0
parenteb169c76d092b289a6a150b725e8fb2de990379b
esp: add vmstate_esp version to embedded ESPState

The QOM object representing ESPState is currently embedded within both the
SYSBUS_ESP and PCI_ESP devices with migration state handled by embedding
vmstate_esp within each device using VMSTATE_STRUCT.

Since the vmstate_esp fields are embedded directly within the migration
stream, the incoming vmstate_esp version_id is lost. The only version information
available is that from vmstate_sysbus_esp_scsi and vmstate_esp_pci_scsi, but
those versions represent their respective devices and not that of the underlying
ESPState.

Resolve this by adding a new version-dependent field in vmstate_sysbus_esp_scsi
and vmstate_esp_pci_scsi which stores the vmstate_esp version_id field within
ESPState to be used to allow migration from older QEMU versions.

Finally bump the vmstate_esp version to 5 to cover the upcoming ESPState changes
within this patch series.

Signed-off-by: Mark Cave-Ayland <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Laurent Vivier <[email protected]>
Message-Id: <20210304221103[email protected]>
hw/scsi/esp-pci.c
hw/scsi/esp.c
include/hw/scsi/esp.h
This page took 0.038451 seconds and 4 git commands to generate.