commit ec691c804f66ee99dc24a6cfe4467a56982f9115
author aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Feb 11 15:20:37 2009 +0000
committer aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> Wed Feb 11 15:20:37 2009 +0000
tree 9352b494d2fac8d7a46a1da797f26887a51d8fb9
parent b0a7b120a357733d9c554a1a3b125991114a1135

qemu: move drives_opt for external use (Marcelo Tosatti)

Device hotplug will use that structure from a separate
file.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6598 c046a42c-6fe2-441c-8c8c-71466251a162

sysemu.h

diff --git a/sysemu.h b/sysemu.h
index 78d70c5..9b99343 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -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

vl.c

diff --git a/vl.c b/vl.c
index 2198151..7b51b54 100644
--- a/vl.c
+++ b/vl.c
@@ -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;