From: John Snow <jsnow@redhat.com>
To: qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, jsnow@redhat.com
Subject: [Qemu-devel] [PULL 09/10] qtest/ahci: add flush retry test
Date: Tue, 28 Apr 2015 19:25:36 -0400 [thread overview]
Message-ID: <1430263537-7786-10-git-send-email-jsnow@redhat.com> (raw)
In-Reply-To: <1430263537-7786-1-git-send-email-jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-id: 1426018503-821-7-git-send-email-jsnow@redhat.com
---
tests/ahci-test.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tests/ahci-test.c b/tests/ahci-test.c
index cd7d2ce..7c23bb2 100644
--- a/tests/ahci-test.c
+++ b/tests/ahci-test.c
@@ -46,6 +46,7 @@
/*** Globals ***/
static char tmp_path[] = "/tmp/qtest.XXXXXX";
+static char debug_path[] = "/tmp/qtest-blkdebug.XXXXXX";
static bool ahci_pedantic;
/*** Function Declarations ***/
@@ -986,6 +987,41 @@ static void test_flush(void)
ahci_shutdown(ahci);
}
+static void test_flush_retry(void)
+{
+ AHCIQState *ahci;
+ AHCICommand *cmd;
+ uint8_t port;
+ const char *s;
+
+ prepare_blkdebug_script(debug_path, "flush_to_disk");
+ ahci = ahci_boot_and_enable("-drive file=blkdebug:%s:%s,if=none,id=drive0,"
+ "format=qcow2,cache=writeback,"
+ "rerror=stop,werror=stop "
+ "-M q35 "
+ "-device ide-hd,drive=drive0 ",
+ debug_path,
+ tmp_path);
+
+ /* Issue Flush Command */
+ port = ahci_port_select(ahci);
+ ahci_port_clear(ahci, port);
+ cmd = ahci_command_create(CMD_FLUSH_CACHE);
+ ahci_command_commit(ahci, cmd, port);
+ ahci_command_issue_async(ahci, cmd);
+ qmp_eventwait("STOP");
+
+ /* Complete the command */
+ s = "{'execute':'cont' }";
+ qmp_async(s);
+ qmp_eventwait("RESUME");
+ ahci_command_wait(ahci, cmd);
+ ahci_command_verify(ahci, cmd);
+
+ ahci_command_free(cmd);
+ ahci_shutdown(ahci);
+}
+
/******************************************************************************/
/* AHCI I/O Test Matrix Definitions */
@@ -1167,6 +1203,7 @@ int main(int argc, char **argv)
{
const char *arch;
int ret;
+ int fd;
int c;
int i, j, k, m;
@@ -1206,6 +1243,11 @@ int main(int argc, char **argv)
close(mkstemp(tmp_path));
mkqcow2(tmp_path, TEST_IMAGE_SIZE_MB);
+ /* Create temporary blkdebug instructions */
+ fd = mkstemp(debug_path);
+ g_assert(fd >= 0);
+ close(fd);
+
/* Run the tests */
qtest_add_func("/ahci/sanity", test_sanity);
qtest_add_func("/ahci/pci_spec", test_pci_spec);
@@ -1227,11 +1269,13 @@ int main(int argc, char **argv)
qtest_add_func("/ahci/io/dma/lba28/fragmented", test_dma_fragmented);
qtest_add_func("/ahci/flush/simple", test_flush);
+ qtest_add_func("/ahci/flush/retry", test_flush_retry);
ret = g_test_run();
/* Cleanup */
unlink(tmp_path);
+ unlink(debug_path);
return ret;
}
--
2.1.0
next prev parent reply other threads:[~2015-04-28 23:25 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-28 23:25 [Qemu-devel] [PULL 00/10] Ide patches John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 01/10] fdc: remove sparc sun4m mutations John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 02/10] qtest/ahci: add qcow2 support to ahci-test John Snow
2015-11-12 10:59 ` Peter Maydell
2015-11-12 17:05 ` John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 03/10] qtest/ahci: test different disk sectors John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 04/10] qtest/ahci: Add simple flush test John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 05/10] qtest/ahci: Allow override of default CLI options John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 06/10] libqtest: add qmp_eventwait John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 07/10] libqtest: add qmp_async John Snow
2015-04-28 23:25 ` [Qemu-devel] [PULL 08/10] libqos: add blkdebug_prepare_script John Snow
2015-04-28 23:25 ` John Snow [this message]
2015-04-28 23:25 ` [Qemu-devel] [PULL 10/10] qtest: Add assertion that required environment variable is set John Snow
2015-04-30 10:05 ` [Qemu-devel] [PULL 00/10] Ide patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430263537-7786-10-git-send-email-jsnow@redhat.com \
--to=jsnow@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).