diff options
author | Christian Borntraeger <borntraeger@de.ibm.com> | 2012-11-22 21:02:55 +0100 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2012-12-11 11:05:10 +0100 |
commit | 3c42ea66888f149d72d600bab63624b2d849e4bf (patch) | |
tree | 867e1510a58211f9d5d96a6b9b5d56822928f2d6 /vl.c | |
parent | 2d0d2837dcf786da415cf4165d37f4ddd684ff57 (diff) | |
download | qemu-3c42ea66888f149d72d600bab63624b2d849e4bf.zip qemu-3c42ea66888f149d72d600bab63624b2d849e4bf.tar.gz qemu-3c42ea66888f149d72d600bab63624b2d849e4bf.tar.bz2 |
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>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -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); |