[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/17] ahci: Recompute cur_cmd on migrate post lo
From: |
John Snow |
Subject: |
[Qemu-devel] [PATCH v4 16/17] ahci: Recompute cur_cmd on migrate post load |
Date: |
Mon, 23 Feb 2015 11:18:05 -0500 |
When the AHCI HBA device is migrated, all of the information that
led to the request being created is stored in the AHCIDevice
structures, except for pointers into guest data where return
information needs to be stored.
The "cur_cmd" field is usually responsible for this.
To rebuild the cur_cmd pointer post-migration, we can utilize
the busy_slot index to figure out where the command header
we are still processing is.
This allows a machine in a halted state from rerror=stop or
werror=stop to be migrated and resume operations without issue.
Signed-off-by: John Snow <address@hidden>
---
hw/ide/ahci.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 56a4867..e1ae36f 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -1376,6 +1376,13 @@ static int ahci_state_post_load(void *opaque, int
version_id)
*/
if (ad->busy_slot == -1) {
check_cmd(s, i);
+ } else {
+ /* We are in the middle of a command, and may need to access
+ * the command header in guest memory again. */
+ if (ad->busy_slot < 0 || ad->busy_slot >= AHCI_MAX_CMDS) {
+ return -1;
+ }
+ ad->cur_cmd = &((AHCICmdHdr *)ad->lst)[ad->busy_slot];
}
}
--
1.9.3
- [Qemu-devel] [PATCH v4 09/17] ide: place initial state of the current request to IDEBus, (continued)
- [Qemu-devel] [PATCH v4 09/17] ide: place initial state of the current request to IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 06/17] ide: move restart callback to common code, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 10/17] ide: migrate initial request state via IDEBus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 05/17] ide: pass IDEBus to the restart_cb, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 07/17] ide: remove restart_cb callback, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 15/17] ahci: add support for restarting non-queued commands, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 13/17] ide: support PIO restart for the ISA controller, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 14/17] ahci: Migrate IDEStatus, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 17/17] qtest/ide: Test flush / retry for ISA and PCI, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 12/17] ide: make more functions static, John Snow, 2015/02/23
- [Qemu-devel] [PATCH v4 16/17] ahci: Recompute cur_cmd on migrate post load,
John Snow <=
- [Qemu-devel] [PATCH v4 11/17] ide: commonize io_buffer_index initialization, John Snow, 2015/02/23
- Re: [Qemu-devel] [PATCH v4 00/17] ide: rerror/werror migration fixes for IDE/ISA and AHCI, Stefan Hajnoczi, 2015/02/25