xen/ioemu-disable-emulated-ide-if-pv.patch

Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
===================================================================
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/qemu-xen.h
@@ -1,6 +1,8 @@
 #ifndef QEMU_XEN_H
 #define QEMU_XEN_H
 
+#include "hw/boards.h"
+
 /* vl.c */
 extern int restore;
 extern int vga_ram_size;
@@ -65,7 +67,7 @@ void handle_buffered_pio(void);
 /* xenstore.c */
 void xenstore_init(void);
 uint32_t xenstore_read_target(void);
-void xenstore_parse_domain_config(int domid);
+void xenstore_parse_domain_config(int domid, QEMUMachine *machine);
 int xenstore_parse_disable_pf_config(void);
 int xenstore_fd(void);
 void xenstore_process_event(void *opaque);
Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vl.c
===================================================================
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/vl.c
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/vl.c
@@ -5861,9 +5861,9 @@ int main(int argc, char **argv, char **e
         if ((msg = xenbus_read(XBT_NIL, "domid", &domid_s)))
             fprintf(stderr,"Can not read our own domid: %s\n", msg);
         else
-            xenstore_parse_domain_config(atoi(domid_s));
+            xenstore_parse_domain_config(atoi(domid_s), machine);
 #else
-        xenstore_parse_domain_config(domid);
+        xenstore_parse_domain_config(domid, machine);
 #endif /* CONFIG_STUBDOM */
     }
 
Index: xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
===================================================================
--- xen-4.6.1-testing.orig/tools/qemu-xen-traditional-dir-remote/xenstore.c
+++ xen-4.6.1-testing/tools/qemu-xen-traditional-dir-remote/xenstore.c
@@ -445,7 +445,7 @@ void xenstore_init(void)
     }
 }
 
-void xenstore_parse_domain_config(int hvm_domid)
+void xenstore_parse_domain_config(int hvm_domid, QEMUMachine *machine)
 {
     char **e_danger = NULL;
     char *buf = NULL;
@@ -739,11 +739,19 @@ void xenstore_parse_domain_config(int hv
 
 #endif
 
-	drives_table[nb_drives].bdrv = bs;
-	drives_table[nb_drives].used = 1;
-    media_filename[nb_drives] = strdup(bs->filename);
-	nb_drives++;
-
+        if (machine == &xenfv_machine) {
+            drives_table[nb_drives].bdrv = bs;
+            drives_table[nb_drives].used = 1;
+#ifdef CONFIG_STUBDOM
+            media_filename[nb_drives] = strdup(danger_buf);
+#else
+            media_filename[nb_drives] = strdup(bs->filename);
+#endif
+            nb_drives++;
+        } else {
+            qemu_aio_flush();
+            bdrv_close(bs);
+        }
     }
 
 #ifdef CONFIG_STUBDOM