From patchwork Thu Dec 13 15:10:19 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/43] block: simplify default_drive Date: Thu, 13 Dec 2012 05:10:19 -0000 From: Kevin Wolf X-Patchwork-Id: 206178 Message-Id: <1355411450-12761-13-git-send-email-kwolf@redhat.com> To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Christian Borntraeger 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 Reviewed-by: Markus Armbruster Signed-off-by: Stefan Hajnoczi --- vl.c | 20 ++++++-------------- 1 files changed, 6 insertions(+), 14 deletions(-) diff --git a/vl.c b/vl.c index ee10d21..6b3827c 100644 --- a/vl.c +++ b/vl.c @@ -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);