From patchwork Tue Apr 6 17:12:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 49532 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D7404B7D46 for ; Wed, 7 Apr 2010 03:12:54 +1000 (EST) Received: from localhost ([127.0.0.1]:45649 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzCKY-0002SZ-Qp for incoming@patchwork.ozlabs.org; Tue, 06 Apr 2010 13:12:50 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NzCK1-0002SF-GM for qemu-devel@nongnu.org; Tue, 06 Apr 2010 13:12:17 -0400 Received: from [140.186.70.92] (port=54601 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NzCJz-0002S5-1U for qemu-devel@nongnu.org; Tue, 06 Apr 2010 13:12:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1NzCJx-0007RR-F4 for qemu-devel@nongnu.org; Tue, 06 Apr 2010 13:12:14 -0400 Received: from verein.lst.de ([213.95.11.210]:33414) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NzCJx-0007Pt-1o for qemu-devel@nongnu.org; Tue, 06 Apr 2010 13:12:13 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id o36HC4WY011002 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO) for ; Tue, 6 Apr 2010 19:12:04 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id o36HC48V011001 for qemu-devel@nongnu.org; Tue, 6 Apr 2010 19:12:04 +0200 Date: Tue, 6 Apr 2010 19:12:04 +0200 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20100406171204.GA10881@lst.de> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: [Qemu-devel] [PATCH v2] cleanup block driver option handling in vl.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Assign directly to the bdrv_flags variable instead of using magic numbers before translating to the BDRV_O_* options. Signed-off-by: Christoph Hellwig Acked-by: Kevin Wolf Index: qemu/vl.c =================================================================== --- qemu.orig/vl.c 2010-04-06 19:05:52.403004388 +0200 +++ qemu/vl.c 2010-04-06 19:07:28.402006066 +0200 @@ -851,10 +851,8 @@ DriveInfo *drive_init(QemuOpts *opts, vo QEMUMachine *machine = opaque; int max_devs; int index; - int cache; - int aio = 0; int ro = 0; - int bdrv_flags; + int bdrv_flags = 0; int on_read_error, on_write_error; const char *devaddr; DriveInfo *dinfo; @@ -863,7 +861,6 @@ DriveInfo *drive_init(QemuOpts *opts, vo *fatal_error = 1; translation = BIOS_ATA_TRANSLATION_AUTO; - cache = 1; if (machine && machine->use_scsi) { type = IF_SCSI; @@ -977,13 +974,13 @@ DriveInfo *drive_init(QemuOpts *opts, vo } if ((buf = qemu_opt_get(opts, "cache")) != NULL) { - if (!strcmp(buf, "off") || !strcmp(buf, "none")) - cache = 0; - else if (!strcmp(buf, "writethrough")) - cache = 1; - else if (!strcmp(buf, "writeback")) - cache = 2; - else { + if (!strcmp(buf, "off") || !strcmp(buf, "none")) { + bdrv_flags |= BDRV_O_NOCACHE; + } else if (!strcmp(buf, "writeback")) { + bdrv_flags |= BDRV_O_CACHE_WB; + } else if (!strcmp(buf, "writethrough")) { + /* this is the default */ + } else { fprintf(stderr, "qemu: invalid cache option\n"); return NULL; } @@ -991,11 +988,11 @@ DriveInfo *drive_init(QemuOpts *opts, vo #ifdef CONFIG_LINUX_AIO if ((buf = qemu_opt_get(opts, "aio")) != NULL) { - if (!strcmp(buf, "threads")) - aio = 0; - else if (!strcmp(buf, "native")) - aio = 1; - else { + if (!strcmp(buf, "native")) { + bdrv_flags |= BDRV_O_NATIVE_AIO; + } else if (!strcmp(buf, "threads")) { + /* this is the default */ + } else { fprintf(stderr, "qemu: invalid aio option\n"); return NULL; } @@ -1169,20 +1166,10 @@ DriveInfo *drive_init(QemuOpts *opts, vo *fatal_error = 0; return NULL; } - bdrv_flags = 0; if (snapshot) { - bdrv_flags |= BDRV_O_SNAPSHOT; - cache = 2; /* always use write-back with snapshot */ - } - if (cache == 0) /* no caching */ - bdrv_flags |= BDRV_O_NOCACHE; - else if (cache == 2) /* write-back */ - bdrv_flags |= BDRV_O_CACHE_WB; - - if (aio == 1) { - bdrv_flags |= BDRV_O_NATIVE_AIO; - } else { - bdrv_flags &= ~BDRV_O_NATIVE_AIO; + /* always use write-back with snapshot */ + bdrv_flags &= ~BDRV_O_CACHE_MASK; + bdrv_flags |= (BDRV_O_SNAPSHOT|BDRV_O_CACHE_WB); } if (ro == 1) {