QEMU is a FAST! processor emulator
CentOS Sources
2015-10-27 605027b02ec0651889e07ee5d6f8d75ce60f2f6a
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
From 699e404550228859f73ce42f36c6da538e1b0fb1 Mon Sep 17 00:00:00 2001
Message-Id: <699e404550228859f73ce42f36c6da538e1b0fb1.1445289321.git.jen@redhat.com>
From: John Snow <jsnow@redhat.com>
Date: Mon, 19 Oct 2015 17:58:34 -0400
Subject: [CHANGE] qtest/ide-test: disable flush-test
To: rhvirt-patches@redhat.com,
    jen@redhat.com
 
RH-Author: John Snow <jsnow@redhat.com>
Message-id: <1445277514-26179-2-git-send-email-jsnow@redhat.com>
Patchwork-id: 68184
O-Subject: [RHEL-7.1.z qemu-kvm PATCH 1/1] qtest/ide-test: disable flush-test
Bugzilla: 1273098
RH-Acked-by: Jeff Nelson <jenelson@redhat.com>
RH-Acked-by: Wei Huang <wei@redhat.com>
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
 
One of the tests downstream causes a race that can result in build
failures. For 7.3, we intend to fix the test properly, but for 7.1.z
and 7.2.*, we disable the test as a workaround.
 
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff E. Nelson <jen@redhat.com>
---
 tests/ide-test.c | 38 --------------------------------------
 1 file changed, 38 deletions(-)
 
diff --git a/tests/ide-test.c b/tests/ide-test.c
index 51f9239..43b7fd6 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -425,43 +425,6 @@ static void test_identify(void)
     ide_test_quit();
 }
 
-static void test_flush(void)
-{
-    uint8_t data;
-
-    ide_test_start(
-        "-vnc none "
-        "-drive file=blkdebug::%s,if=ide,cache=writeback",
-        tmp_path);
-
-    /* Delay the completion of the flush request until we explicitly do it */
-    qmp("{'execute':'human-monitor-command', 'arguments': { "
-        "'command-line': 'qemu-io ide0-hd0 \"break flush_to_os A\"'} }");
-
-    /* FLUSH CACHE command on device 0*/
-    outb(IDE_BASE + reg_device, 0);
-    outb(IDE_BASE + reg_command, CMD_FLUSH_CACHE);
-
-    /* Check status while request is in flight*/
-    data = inb(IDE_BASE + reg_status);
-    assert_bit_set(data, BSY | DRDY);
-    assert_bit_clear(data, DF | ERR | DRQ);
-
-    /* Complete the command */
-    qmp("{'execute':'human-monitor-command', 'arguments': { "
-        "'command-line': 'qemu-io ide0-hd0 \"resume A\"'} }");
-
-    /* Check registers */
-    data = inb(IDE_BASE + reg_device);
-    g_assert_cmpint(data & DEV, ==, 0);
-
-    data = inb(IDE_BASE + reg_status);
-    assert_bit_set(data, DRDY);
-    assert_bit_clear(data, BSY | DF | ERR | DRQ);
-
-    ide_test_quit();
-}
-
 static void test_flush_nodev(void)
 {
     ide_test_start("");
@@ -505,7 +468,6 @@ int main(int argc, char **argv)
     qtest_add_func("/ide/bmdma/long_prdt", test_bmdma_long_prdt);
     qtest_add_func("/ide/bmdma/teardown", test_bmdma_teardown);
 
-    qtest_add_func("/ide/flush", test_flush);
     qtest_add_func("/ide/flush_nodev", test_flush_nodev);
 
     ret = g_test_run();
-- 
2.4.3