ppc4xx: correct SDRAM controller warning message condition

[qemu.git] / hw / boards.h

diff --git a/hw/boards.h b/hw/boards.h
index 68414d7990424c8a3803a79255ce6708fdb3d22f..6f0f0d79259e3601e1c6cb5f002379e4b2284eb1 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -5,7 +5,7 @@
 
 #include "qdev.h"
 
-typedef void QEMUMachineInitFunc(a_ram_addr ram_size,
+typedef void QEMUMachineInitFunc(ram_addr_t ram_size,
                                  const char *boot_device,
                                  const char *kernel_filename,
                                  const char *kernel_cmdline,
@@ -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;