[Qemu-devel] [PATCH 6/9] Make drives_opt[] accessible from device initialization

[Markus Armbruster]

From: Markus Armbruster <address@hidden>

This is in preparation of pci=... support for block devices.
---
 sysemu.h |   10 ++++++++++
 vl.c     |    7 ++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sysemu.h b/sysemu.h
index 56eb9b3..79cbdf0 100644
--- a/sysemu.h
+++ b/sysemu.h
@@ -134,6 +134,7 @@ typedef struct DriveInfo {
     int bus;
     int unit;
     char serial[21];
+    int drive_opt_idx;
 } DriveInfo;
 
 #define MAX_IDE_DEVS   2
@@ -143,6 +144,15 @@ typedef struct DriveInfo {
 extern int nb_drives;
 extern DriveInfo drives_table[MAX_DRIVES+1];
 
+struct drive_opt {
+    const char *file;
+    char opt[1024];
+    int used;
+};
+
+extern struct drive_opt drives_opt[MAX_DRIVES];
+extern int nb_drives_opt;
+
 extern int drive_get_index(BlockInterfaceType type, int bus, int unit);
 extern int drive_get_max_bus(BlockInterfaceType type);
 extern const char *drive_get_serial(BlockDriverState *bdrv);
diff --git a/vl.c b/vl.c
index 4c1045c..cf413c2 100644
--- a/vl.c
+++ b/vl.c
@@ -246,11 +246,8 @@ int alt_grab = 0;
 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];
-} drives_opt[MAX_DRIVES];
+int nb_drives_opt;
+struct drive_opt drives_opt[MAX_DRIVES];
 
 static CPUState *cur_cpu;
 static CPUState *next_cpu;
-- 
1.6.0.6