[Qemu-devel] [6598] qemu: move drives_opt for external use (Marcelo Tosatti)

[Anthony Liguori]

Revision: 6598
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6598
Author:   aliguori
Date:     2009-02-11 15:20:37 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
qemu: move drives_opt for external use (Marcelo Tosatti)

Device hotplug will use that structure from a separate
file.

Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>

Modified Paths:
--------------
    trunk/sysemu.h
    trunk/vl.c

Modified: trunk/sysemu.h
===================================================================
--- trunk/sysemu.h      2009-02-11 15:20:29 UTC (rev 6597)
+++ trunk/sysemu.h      2009-02-11 15:20:37 UTC (rev 6598)
@@ -154,6 +154,15 @@
 extern const char *drive_get_serial(BlockDriverState *bdrv);
 extern BlockInterfaceErrorAction drive_get_onerror(BlockDriverState *bdrv);
 
+struct drive_opt {
+    const char *file;
+    char opt[1024];
+    int used;
+};
+
+extern struct drive_opt drives_opt[MAX_DRIVES];
+extern int nb_drives_opt;
+
 /* serial ports */
 
 #define MAX_SERIAL_PORTS 4

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c  2009-02-11 15:20:29 UTC (rev 6597)
+++ trunk/vl.c  2009-02-11 15:20:37 UTC (rev 6598)
@@ -242,12 +242,8 @@
 unsigned int nb_prom_envs = 0;
 const char *prom_envs[MAX_PROM_ENVS];
 #endif
-static int nb_drives_opt;
-static struct drive_opt {
-    const char *file;
-    char opt[1024];
-    int used;
-} drives_opt[MAX_DRIVES];
+int nb_drives_opt;
+struct drive_opt drives_opt[MAX_DRIVES];
 
 static CPUState *cur_cpu;
 static CPUState *next_cpu;