From patchwork Thu Nov 22 20:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 201181 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0D9B22C008D for ; Fri, 23 Nov 2012 07:03:17 +1100 (EST) Received: from localhost ([::1]:58790 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbczT-0006rD-5g for incoming@patchwork.ozlabs.org; Thu, 22 Nov 2012 15:03:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44346) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbczJ-0006r7-No for qemu-devel@nongnu.org; Thu, 22 Nov 2012 15:03:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TbczI-0005TP-JA for qemu-devel@nongnu.org; Thu, 22 Nov 2012 15:03:05 -0500 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:49732) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TbczI-0005TA-9z for qemu-devel@nongnu.org; Thu, 22 Nov 2012 15:03:04 -0500 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Nov 2012 20:03:03 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 22 Nov 2012 20:03:01 -0000 Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qAMK2rgg58261628 for ; Thu, 22 Nov 2012 20:02:53 GMT Received: from d06av01.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qAMK30bY028454 for ; Thu, 22 Nov 2012 13:03:01 -0700 Received: from BR96EGXR.ibm.com (sig-9-79-38-37.de.ibm.com [9.79.38.37]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qAMK2wee028390; Thu, 22 Nov 2012 13:02:59 -0700 From: Christian Borntraeger To: Markus Armbruster Date: Thu, 22 Nov 2012 21:02:55 +0100 Message-Id: <1353614576-21015-2-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1353614576-21015-1-git-send-email-borntraeger@de.ibm.com> References: <877gpdybqr.fsf@blackfin.pond.sub.org> <1353614576-21015-1-git-send-email-borntraeger@de.ibm.com> x-cbid: 12112220-4966-0000-0000-0000042EA19E X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.106 Cc: Kevin Wolf , Peter Maydell , Anthony Liguori , Igor Mitsyanko , qemu-devel , Alexander Graf , Christian Borntraeger , Jens Freimann , Stefan Hajnoczi , Cornelia Huck , Andreas Faerber , Einar Lueck Subject: [Qemu-devel] [PATCH 1/2] block: simply default_drive X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- vl.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/vl.c b/vl.c index 86f0dd8..c3ca0f0 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; } @@ -3780,12 +3774,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);