|
 |
9ae3a8 |
From 228e49fabffa644ab7a6a03e98205f293115dc89 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <228e49fabffa644ab7a6a03e98205f293115dc89.1445029944.git.jen@redhat.com>
|
|
|
9ae3a8 |
From: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 16 Oct 2015 16:26:24 -0500
|
|
|
9ae3a8 |
Subject: [CHANGE] qtest/ide-test: disable flush-test
|
|
|
9ae3a8 |
To: rhvirt-patches@redhat.com,
|
|
|
9ae3a8 |
jen@redhat.com
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1445012784-22604-2-git-send-email-jsnow@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 68169
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm PATCH 1/1] qtest/ide-test: disable flush-test
|
|
|
9ae3a8 |
Bugzilla: 1270341
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Wei Huang <wei@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Jeff Nelson <jenelson@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
One of the tests downstream causes a race that can result in build
|
|
|
9ae3a8 |
failures. For 7.3, we intend to fix the test properly, but for 7.2,
|
|
|
9ae3a8 |
we disable the test as a workaround.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
tests/ide-test.c | 38 --------------------------------------
|
|
|
9ae3a8 |
1 file changed, 38 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/tests/ide-test.c b/tests/ide-test.c
|
|
|
9ae3a8 |
index 51f9239..43b7fd6 100644
|
|
|
9ae3a8 |
--- a/tests/ide-test.c
|
|
|
9ae3a8 |
+++ b/tests/ide-test.c
|
|
|
9ae3a8 |
@@ -425,43 +425,6 @@ static void test_identify(void)
|
|
|
9ae3a8 |
ide_test_quit();
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static void test_flush(void)
|
|
|
9ae3a8 |
-{
|
|
|
9ae3a8 |
- uint8_t data;
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- ide_test_start(
|
|
|
9ae3a8 |
- "-vnc none "
|
|
|
9ae3a8 |
- "-drive file=blkdebug::%s,if=ide,cache=writeback",
|
|
|
9ae3a8 |
- tmp_path);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* Delay the completion of the flush request until we explicitly do it */
|
|
|
9ae3a8 |
- qmp("{'execute':'human-monitor-command', 'arguments': { "
|
|
|
9ae3a8 |
- "'command-line': 'qemu-io ide0-hd0 \"break flush_to_os A\"'} }");
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* FLUSH CACHE command on device 0*/
|
|
|
9ae3a8 |
- outb(IDE_BASE + reg_device, 0);
|
|
|
9ae3a8 |
- outb(IDE_BASE + reg_command, CMD_FLUSH_CACHE);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* Check status while request is in flight*/
|
|
|
9ae3a8 |
- data = inb(IDE_BASE + reg_status);
|
|
|
9ae3a8 |
- assert_bit_set(data, BSY | DRDY);
|
|
|
9ae3a8 |
- assert_bit_clear(data, DF | ERR | DRQ);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* Complete the command */
|
|
|
9ae3a8 |
- qmp("{'execute':'human-monitor-command', 'arguments': { "
|
|
|
9ae3a8 |
- "'command-line': 'qemu-io ide0-hd0 \"resume A\"'} }");
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- /* Check registers */
|
|
|
9ae3a8 |
- data = inb(IDE_BASE + reg_device);
|
|
|
9ae3a8 |
- g_assert_cmpint(data & DEV, ==, 0);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- data = inb(IDE_BASE + reg_status);
|
|
|
9ae3a8 |
- assert_bit_set(data, DRDY);
|
|
|
9ae3a8 |
- assert_bit_clear(data, BSY | DF | ERR | DRQ);
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
- ide_test_quit();
|
|
|
9ae3a8 |
-}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
static void test_flush_nodev(void)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
ide_test_start("");
|
|
|
9ae3a8 |
@@ -505,7 +468,6 @@ int main(int argc, char **argv)
|
|
|
9ae3a8 |
qtest_add_func("/ide/bmdma/long_prdt", test_bmdma_long_prdt);
|
|
|
9ae3a8 |
qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- qtest_add_func("/ide/flush", test_flush);
|
|
|
9ae3a8 |
qtest_add_func("/ide/flush_nodev", test_flush_nodev);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
ret = g_test_run();
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
2.4.3
|
|
|
9ae3a8 |
|