qemu: PCI device, disk and host network hot-add / hot-remove (Marcelo Tosatti)

[qemu] / hw / boards.h

diff --git a/hw/boards.h b/hw/boards.h
index 4c91e97..7384817 100644 (file)
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -3,8 +3,8 @@
 #ifndef HW_BOARDS_H
 #define HW_BOARDS_H
 
-typedef void QEMUMachineInitFunc(int ram_size, int vga_ram_size,
-                                 const char *boot_device, DisplayState *ds,
+typedef void QEMUMachineInitFunc(ram_addr_t ram_size, int vga_ram_size,
+                                 const char *boot_device,
                                  const char *kernel_filename,
                                  const char *kernel_cmdline,
                                  const char *initrd_filename,
@@ -15,14 +15,21 @@ typedef struct QEMUMachine {
     const char *desc;
     QEMUMachineInitFunc *init;
 #define RAMSIZE_FIXED  (1 << 0)
-    size_t ram_require;
+    ram_addr_t ram_require;
+    int nodisk_ok;
+    int use_scsi;
+    int max_cpus;
     struct QEMUMachine *next;
 } QEMUMachine;
 
 int qemu_register_machine(QEMUMachine *m);
+void register_machines(void);
+
+extern QEMUMachine *current_machine;
 
 /* Axis ETRAX.  */
 extern QEMUMachine bareetraxfs_machine;
+extern QEMUMachine axisdev88_machine;
 
 /* pc.c */
 extern QEMUMachine pc_machine;
@@ -34,6 +41,7 @@ extern QEMUMachine core99_machine;
 extern QEMUMachine heathrow_machine;
 extern QEMUMachine ref405ep_machine;
 extern QEMUMachine taihu_machine;
+extern QEMUMachine bamboo_machine;
 
 /* mips_r4k.c */
 extern QEMUMachine mips_machine;
@@ -63,6 +71,8 @@ extern QEMUMachine ss1000_machine, ss2000_machine;
 
 /* sun4u.c */
 extern QEMUMachine sun4u_machine;
+extern QEMUMachine sun4v_machine;
+extern QEMUMachine niagara_machine;
 
 /* integratorcp.c */
 extern QEMUMachine integratorcp_machine;
@@ -80,11 +90,16 @@ extern QEMUMachine spitzpda_machine;
 extern QEMUMachine borzoipda_machine;
 extern QEMUMachine terrierpda_machine;
 
+/* omap_sx1.c */
+extern QEMUMachine sx1_machine_v1;
+extern QEMUMachine sx1_machine_v2;
+
 /* palm.c */
 extern QEMUMachine palmte_machine;
 
 /* nseries.c */
 extern QEMUMachine n800_machine;
+extern QEMUMachine n810_machine;
 
 /* gumstix.c */
 extern QEMUMachine connex_machine;
@@ -106,4 +121,10 @@ extern QEMUMachine dummy_m68k_machine;
 /* mainstone.c */
 extern QEMUMachine mainstone2_machine;
 
+/* musicpal.c */
+extern QEMUMachine musicpal_machine;
+
+/* tosa.c */
+extern QEMUMachine tosapda_machine;
+
 #endif