Merge remote branch 'mst/for_anthony' into staging

[qemu.git] / hw / boards.h

diff --git a/hw/boards.h b/hw/boards.h
index d8893413d42536e072e63931b5ea3bb9e916e2b0..6f0f0d79259e3601e1c6cb5f002379e4b2284eb1 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -19,8 +19,15 @@ typedef struct QEMUMachine {
     QEMUMachineInitFunc *init;
     int use_scsi;
     int max_cpus;
+    unsigned int no_serial:1,
+        no_parallel:1,
+        use_virtcon:1,
+        no_vga:1,
+        no_floppy:1,
+        no_cdrom:1,
+        no_sdcard:1;
     int is_default;
-    CompatProperty *compat_props;
+    GlobalProperty *compat_props;
     struct QEMUMachine *next;
 } QEMUMachine;