OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

defaults: split default_drive

Browse Source 
Split default_drive into default_{floppy,cdrom,sdcard}.
Also add QEMUMachine flags to disable them per machine.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-12-16 14:25:39 +01:00 committed by Anthony Liguori
parent 2daa119126
commit ac33f8fad1
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/boards.h
View File

@ -22,7 +22,10 @@ typedef struct QEMUMachine {
int no_serial:1,
no_parallel:1,
use_virtcon:1,
no_vga:1;
no_vga:1,
no_floppy:1,
no_cdrom:1,
no_sdcard:1;
int is_default;
GlobalProperty *compat_props;
struct QEMUMachine *next;

23
vl.c
View File

@ -274,7 +274,9 @@ static int default_parallel = 1;
static int default_virtcon = 1;
static int default_monitor = 1;
static int default_vga = 1;
static int default_drive = 1;
static int default_floppy = 1;
static int default_cdrom = 1;
static int default_sdcard = 1;
static struct {
const char *driver;
@ -5591,7 +5593,9 @@ int main(int argc, char **argv, char **envp)
default_monitor = 0;
default_vga = 0;
default_net = 0;
default_drive = 0;
default_floppy = 0;
default_cdrom = 0;
default_sdcard = 0;
break;
#ifndef _WIN32
case QEMU_OPTION_chroot:
@ -5685,6 +5689,15 @@ int main(int argc, char **argv, char **envp)
if (machine->no_vga) {
default_vga = 0;
}
if (machine->no_floppy) {
default_floppy = 0;
}
if (machine->no_cdrom) {
default_cdrom = 0;
}
if (machine->no_sdcard) {
default_sdcard = 0;
}
if (display_type == DT_NOGRAPHIC) {
if (default_parallel)
@ -5843,13 +5856,17 @@ int main(int argc, char **argv, char **envp)
blk_mig_init();
if (default_drive) {
if (default_cdrom) {
/* we always create the cdrom drive, even if no disk is there */
drive_add(NULL, CDROM_ALIAS);
}
if (default_floppy) {
/* we always create at least one floppy */
drive_add(NULL, FD_ALIAS, 0);
}
if (default_sdcard) {
/* we always create one sd slot, even if no card is in it */
drive_add(NULL, SD_ALIAS);
}