[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 01/14] libqos/ahci: Add halted command helpers
From: |
John Snow |
Subject: |
[Qemu-devel] [PULL v2 01/14] libqos/ahci: Add halted command helpers |
Date: |
Tue, 12 May 2015 14:46:13 -0400 |
Sometimes we want a command to halt the VM instead
of complete successfully, so it'd be nice to let the
libqos/ahci functions cope with such scenarios.
Signed-off-by: John Snow <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Message-id: address@hidden
---
tests/libqos/ahci.c | 27 +++++++++++++++++++++++++++
tests/libqos/ahci.h | 3 +++
2 files changed, 30 insertions(+)
diff --git a/tests/libqos/ahci.c b/tests/libqos/ahci.c
index 843cf72..229409b 100644
--- a/tests/libqos/ahci.c
+++ b/tests/libqos/ahci.c
@@ -566,6 +566,33 @@ inline unsigned size_to_prdtl(unsigned bytes, unsigned
bytes_per_prd)
return (bytes + bytes_per_prd - 1) / bytes_per_prd;
}
+/* Issue a command, expecting it to fail and STOP the VM */
+AHCICommand *ahci_guest_io_halt(AHCIQState *ahci, uint8_t port,
+ uint8_t ide_cmd, uint64_t buffer,
+ size_t bufsize, uint64_t sector)
+{
+ AHCICommand *cmd;
+
+ cmd = ahci_command_create(ide_cmd);
+ ahci_command_adjust(cmd, sector, buffer, bufsize, 0);
+ ahci_command_commit(ahci, cmd, port);
+ ahci_command_issue_async(ahci, cmd);
+ qmp_eventwait("STOP");
+
+ return cmd;
+}
+
+/* Resume a previously failed command and verify/finalize */
+void ahci_guest_io_resume(AHCIQState *ahci, AHCICommand *cmd)
+{
+ /* Complete the command */
+ qmp_async("{'execute':'cont' }");
+ qmp_eventwait("RESUME");
+ ahci_command_wait(ahci, cmd);
+ ahci_command_verify(ahci, cmd);
+ ahci_command_free(cmd);
+}
+
/* Given a guest buffer address, perform an IO operation */
void ahci_guest_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd,
uint64_t buffer, size_t bufsize, uint64_t sector)
diff --git a/tests/libqos/ahci.h b/tests/libqos/ahci.h
index 40e8ca4..779e812 100644
--- a/tests/libqos/ahci.h
+++ b/tests/libqos/ahci.h
@@ -524,6 +524,9 @@ unsigned ahci_pick_cmd(AHCIQState *ahci, uint8_t port);
unsigned size_to_prdtl(unsigned bytes, unsigned bytes_per_prd);
void ahci_guest_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd,
uint64_t gbuffer, size_t size, uint64_t sector);
+AHCICommand *ahci_guest_io_halt(AHCIQState *ahci, uint8_t port, uint8_t
ide_cmd,
+ uint64_t gbuffer, size_t size, uint64_t
sector);
+void ahci_guest_io_resume(AHCIQState *ahci, AHCICommand *cmd);
void ahci_io(AHCIQState *ahci, uint8_t port, uint8_t ide_cmd,
void *buffer, size_t bufsize, uint64_t sector);
--
2.1.0
- [Qemu-devel] [PULL v2 00/14] Ide patches, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 08/14] qtest/ahci: add halted dma test, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 01/14] libqos/ahci: Add halted command helpers,
John Snow <=
- [Qemu-devel] [PULL v2 02/14] libqos/ahci: Fix sector set method, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 04/14] ich9/ahci: Enable Migration, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 07/14] qtest/ahci: add flush migrate test, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 06/14] qtest/ahci: add migrate dma test, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 12/14] qtest: add memset to qtest protocol, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 05/14] qtest/ahci: Add migration test, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 03/14] libqos: Add migration helpers, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 14/14] qtest: pre-buffer hex nibs, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 09/14] qtest/ahci: add migrate halted dma test, John Snow, 2015/05/12
- [Qemu-devel] [PULL v2 13/14] libqos/ahci: Swap memread/write with bufread/write, John Snow, 2015/05/12