From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LXGtH-0003zz-Eb
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 10:20:43 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LXGtG-0003zj-VA
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 10:20:43 -0500
Received: from [199.232.76.173] (port=52339 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LXGtG-0003zf-NI
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 10:20:42 -0500
Received: from savannah.gnu.org ([199.232.41.3]:40286 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LXGtG-0002CD-FT
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 10:20:42 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LXGtF-0004qA-Al
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 15:20:41 +0000
Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aliguori@savannah.gnu.org>) id 1LXGtC-0004q5-Qs
	for qemu-devel@nongnu.org; Wed, 11 Feb 2009 15:20:39 +0000
MIME-Version: 1.0
Errors-To: aliguori
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Anthony Liguori <anthony@codemonkey.ws>
Message-Id: <E1LXGtC-0004q5-Qs@cvs.savannah.gnu.org>
Date: Wed, 11 Feb 2009 15:20:39 +0000
Subject: [Qemu-devel] [6598] qemu: move drives_opt for external use (Marcelo
	Tosatti)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

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 <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

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;