[Qemu-devel] [PATCH 1/2] ide-test: fix timeouts

[John Snow]

Use explicit timeouts instead of trying to fudge
it by counting nsleep calls.

Signed-off-by: John Snow <js...@redhat.com>
---
 tests/ide-test.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index fc1ce52..d37dc5e 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -642,15 +642,20 @@ static void nsleep(int64_t nsecs)
 
 static uint8_t ide_wait_clear(uint8_t flag)
 {
-    int i;
     uint8_t data;
+    time_t st, now;
 
     /* Wait with a 5 second timeout */
-    for (i = 0; i <= 12500000; i++) {
+    time(&st);
+    while (true) {
         data = inb(IDE_BASE + reg_status);
         if (!(data & flag)) {
             return data;
         }
+        time(&now);
+        if (difftime(now, st) > 5.0) {
+            break;
+        }
         nsleep(400);
     }
     g_assert_not_reached();
@@ -658,14 +663,19 @@ static uint8_t ide_wait_clear(uint8_t flag)
 
 static void ide_wait_intr(int irq)
 {
-    int i;
+    time_t st, now;
     bool intr;
 
-    for (i = 0; i <= 12500000; i++) {
+    time(&st);
+    while (true) {
         intr = get_irq(irq);
         if (intr) {
             return;
         }
+        time(&now);
+        if (difftime(now, st) > 5.0) {
+            break;
+        }
         nsleep(400);
     }
 
-- 
2.4.3