falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block: simplify default_drive 

Markus Armbruster pointed out that there is only one caller
to default_drive with IF_DEFAULT as a type. Lets get rid
of the block_default_type parameter and adopt the caller
to do the right thing (asking the machine struct).

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Christian Borntraeger 2012-11-22 21:02:55 +01:00 committed by Kevin Wolf
parent 2d0d2837dc
commit 3c42ea6688
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
vl.c
View File

@ -899,17 +899,11 @@ static int drive_enable_snapshot(QemuOpts *opts, void *opaque)
return 0;
}
static void default_drive(int enable, int snapshot,
BlockInterfaceType block_default_type,
BlockInterfaceType type, int index,
const char *optstr)
static void default_drive(int enable, int snapshot, BlockInterfaceType type,
int index, const char *optstr)
{
QemuOpts *opts;
if (type == IF_DEFAULT) {
type = block_default_type;
}
if (!enable || drive_get_by_index(type, index)) {
return;
}
@ -3776,12 +3770,10 @@ int main(int argc, char **argv, char **envp)
exit(1);
}
default_drive(default_cdrom, snapshot, machine->block_default_type,
IF_DEFAULT, 2, CDROM_OPTS);
default_drive(default_floppy, snapshot, machine->block_default_type,
IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, machine->block_default_type,
IF_SD, 0, SD_OPTS);
default_drive(default_cdrom, snapshot, machine->block_default_type, 2,
CDROM_OPTS);
default_drive(default_floppy, snapshot, IF_FLOPPY, 0, FD_OPTS);
default_drive(default_sdcard, snapshot, IF_SD, 0, SD_OPTS);
register_savevm_live(NULL, "ram", 0, 4, &savevm_ram_handlers, NULL);