mirror of https://github.com/xemu-project/xemu.git
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
This commit is contained in:
parent
b0a7b120a3
commit
ec691c804f
9
sysemu.h
9
sysemu.h
|
@ -154,6 +154,15 @@ extern void drive_remove(int index);
|
||||||
extern const char *drive_get_serial(BlockDriverState *bdrv);
|
extern const char *drive_get_serial(BlockDriverState *bdrv);
|
||||||
extern BlockInterfaceErrorAction drive_get_onerror(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 */
|
/* serial ports */
|
||||||
|
|
||||||
#define MAX_SERIAL_PORTS 4
|
#define MAX_SERIAL_PORTS 4
|
||||||
|
|
8
vl.c
8
vl.c
|
@ -242,12 +242,8 @@ int alt_grab = 0;
|
||||||
unsigned int nb_prom_envs = 0;
|
unsigned int nb_prom_envs = 0;
|
||||||
const char *prom_envs[MAX_PROM_ENVS];
|
const char *prom_envs[MAX_PROM_ENVS];
|
||||||
#endif
|
#endif
|
||||||
static int nb_drives_opt;
|
int nb_drives_opt;
|
||||||
static struct drive_opt {
|
struct drive_opt drives_opt[MAX_DRIVES];
|
||||||
const char *file;
|
|
||||||
char opt[1024];
|
|
||||||
int used;
|
|
||||||
} drives_opt[MAX_DRIVES];
|
|
||||||
|
|
||||||
static CPUState *cur_cpu;
|
static CPUState *cur_cpu;
|
||||||
static CPUState *next_cpu;
|
static CPUState *next_cpu;
|
||||||
|
|
Loading…
Reference in New Issue