Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150907' into...

[qemu.git] / tests / hd-geo-test.c

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index b72042e59d49ebddcafd15081b87f530036fd443..00afc209e6a46801849154043b86ef6fcbf17d75 100644 (file)
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -22,8 +22,6 @@
 #include "qemu-common.h"
 #include "libqtest.h"
 
-static const char test_image[] = "/tmp/qtest.XXXXXX";
-
 static char *create_test_img(int secs)
 {
     char *template = strdup("/tmp/qtest.XXXXXX");
@@ -171,7 +169,7 @@ static int setup_common(char *argv[], int argv_sz)
 {
     memset(cur_ide, 0, sizeof(cur_ide));
     return append_arg(0, argv, argv_sz,
-                      g_strdup("-nodefaults -display none"));
+                      g_strdup("-nodefaults"));
 }
 
 static void setup_mbr(int img_idx, MBRcontents mbr)
@@ -208,7 +206,7 @@ static int setup_ide(int argc, char *argv[], int argv_sz,
 {
     char *s1, *s2, *s3;
 
-    s1 = g_strdup_printf("-drive id=drive%d,if=%s",
+    s1 = g_strdup_printf("-drive id=drive%d,if=%s,format=raw",
                          ide_idx, dev ? "none" : "ide");
     s2 = dev ? g_strdup("") : g_strdup_printf(",index=%d", ide_idx);