[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 10/17] ide: migrate initial request state via IDE
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v2 10/17] ide: migrate initial request state via IDEBus |
Date: |
Tue, 16 Dec 2014 20:36:00 -0500 |
From: Paolo Bonzini <address@hidden>
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 <address@hidden>
Signed-off-by: John Snow <address@hidden>
---
hw/ide/core.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/hw/ide/core.c b/hw/ide/core.c
index d4659dc..0459ea1 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -2633,10 +2633,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()
}
};
--
1.9.3
- [Qemu-devel] [PATCH v2 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, (continued)
- [Qemu-devel] [PATCH v2 01/17] ide: start extracting ide_restart_dma out of bmdma_restart_dma, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 02/17] ide: prepare to move restart to common code, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 04/17] ide: do not use BMDMA in restart callback, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 03/17] ide: introduce ide_register_restart_cb, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 07/17] ide: remove restart_cb callback, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 06/17] ide: move restart callback to common code, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 08/17] ide: replace set_unit callback with more IDEBus state, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 11/17] ide: commonize io_buffer_index initialization, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 10/17] ide: migrate initial request state via IDEBus,
John Snow <=
- [Qemu-devel] [PATCH v2 12/17] ide: make more functions static, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 13/17] ide: support PIO restart for the ISA controller, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 15/17] ahci: add support for restarting non-queued commands, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 14/17] ahci: Migrate IDEStatus, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 17/17] qtest/ide: Test flush / retry for ISA and PCI, John Snow, 2014/12/16
- [Qemu-devel] [PATCH v2 16/17] ahci: Recompute cur_cmd on migrate post load, John Snow, 2014/12/16
- Re: [Qemu-devel] [PATCH v2 00/17] ide: rerror and werror support for IDE and AHCI, Markus Armbruster, 2014/12/17