diff options
| author | Mark Cave-Ayland | 2021-06-13 12:26:14 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-06-15 17:17:09 +0200 |
| commit | 0bcd5a18940e1c1e3350b93cfadcdc6b58ca1c0e (patch) | |
| tree | 92e37f6726432f5e81233be7bc407e19ce6c72e8 | |
| parent | esp: correctly accumulate extended messages for PDMA (diff) | |
| download | qemu-0bcd5a18940e1c1e3350b93cfadcdc6b58ca1c0e.tar.gz qemu-0bcd5a18940e1c1e3350b93cfadcdc6b58ca1c0e.tar.xz qemu-0bcd5a18940e1c1e3350b93cfadcdc6b58ca1c0e.zip | |
esp: fix migration version check in esp_is_version_5()
Commit 4e78f3bf35 "esp: defer command completion interrupt on incoming data
transfers" added a version check for use with VMSTATE_*_TEST macros to allow
migration from older QEMU versions. Unfortunately the version check fails to
work in its current form since if the VMStateDescription version_id is
incremented, the test returns false and so the fields are not included in the
outgoing migration stream.
Change the version check to use >= rather == to ensure that migration works
correctly when the ESPState VMStateDescription has version_id > 5.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Fixes: 4e78f3bf35 ("esp: defer command completion interrupt on incoming data transfers")
Message-Id: <20210613102614.5438-1-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | hw/scsi/esp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index 3e6f4094fc..8fad87be9d 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -1128,7 +1128,7 @@ static bool esp_is_version_5(void *opaque, int version_id) ESPState *s = ESP(opaque); version_id = MIN(version_id, s->mig_version_id); - return version_id == 5; + return version_id >= 5; } int esp_pre_save(void *opaque) |