qapi: Plumb in 'boxed' to qapi generator lower levels

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

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index 00afc209e6a46801849154043b86ef6fcbf17d75..12ee3929daf0016cd7d74b6ce9abafaa1fda9c19 100644 (file)
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -15,10 +15,7 @@
  * Improvements welcome.
  */
 
  * Improvements welcome.
  */
 

-#include <glib.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
+#include "qemu/osdep.h"

 #include "qemu-common.h"
 #include "libqtest.h"
 
 #include "qemu-common.h"
 #include "libqtest.h"
 


@@ -206,13 +203,13 @@ static int setup_ide(int argc, char *argv[], int argv_sz,
 {
     char *s1, *s2, *s3;
 
 {
     char *s1, *s2, *s3;
 

-    s1 = g_strdup_printf("-drive id=drive%d,if=%s,format=raw",
+    s1 = g_strdup_printf("-drive id=drive%d,if=%s",

                          ide_idx, dev ? "none" : "ide");
     s2 = dev ? g_strdup("") : g_strdup_printf(",index=%d", ide_idx);
 
     if (img_secs[img_idx] >= 0) {
         setup_mbr(img_idx, mbr);
                          ide_idx, dev ? "none" : "ide");
     s2 = dev ? g_strdup("") : g_strdup_printf(",index=%d", ide_idx);
 
     if (img_secs[img_idx] >= 0) {
         setup_mbr(img_idx, mbr);

-        s3 = g_strdup_printf(",file=%s", img_file_name[img_idx]);
+        s3 = g_strdup_printf(",format=raw,file=%s", img_file_name[img_idx]);

     } else {
         s3 = g_strdup(",media=cdrom");
     }
     } else {
         s3 = g_strdup(",media=cdrom");
     }