diff options
| author | Paolo Bonzini | 2015-02-23 17:17:59 +0100 |
|---|---|---|
| committer | Kevin Wolf | 2015-03-10 14:02:22 +0100 |
| commit | d12b9ff2a4e21587e5b180008c88a0e6e1ec8ac5 (patch) | |
| tree | 18539547fcba9647d5bb2f9991eaf848f2b77b38 /hw/ide/core.c | |
| parent | ide: place initial state of the current request to IDEBus (diff) | |
| download | qemu-d12b9ff2a4e21587e5b180008c88a0e6e1ec8ac5.tar.gz qemu-d12b9ff2a4e21587e5b180008c88a0e6e1ec8ac5.tar.xz qemu-d12b9ff2a4e21587e5b180008c88a0e6e1ec8ac5.zip | |
ide: migrate initial request state via IDEBus
This only breaks backwards migration compatibility if the bus is in
an error state. It is in principle possible to avoid this by making
two subsections (one for version 1, and one for version 2, but with
the same name) with different "_needed" callbacks. The v1 callback would
return true if error_status != 0 and the bus is PATA; the v2 callback
would return true if error_status != 0 and the bus is AHCI.
Forward migration keeps working.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1424708286-16483-11-git-send-email-jsnow@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/core.c')
| -rw-r--r-- | hw/ide/core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ide/core.c b/hw/ide/core.c index 71ec1e76dc..b62a94aac2 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -2643,10 +2643,13 @@ const VMStateDescription vmstate_ide_drive = { static const VMStateDescription vmstate_ide_error_status = { .name ="ide_bus/error", - .version_id = 1, + .version_id = 2, .minimum_version_id = 1, .fields = (VMStateField[]) { VMSTATE_INT32(error_status, IDEBus), + VMSTATE_INT64_V(retry_sector_num, IDEBus, 2), + VMSTATE_UINT32_V(retry_nsector, IDEBus, 2), + VMSTATE_UINT8_V(retry_unit, IDEBus, 2), VMSTATE_END_OF_LIST() } }; |