From patchwork Fri Apr 23 15:30:48 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 50843 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 728C7B7D25 for ; Sat, 24 Apr 2010 02:24:24 +1000 (EST) Received: from localhost ([127.0.0.1]:46045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5LSg-0001RF-8l for incoming@patchwork.ozlabs.org; Fri, 23 Apr 2010 12:10:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O5KrY-0007dM-UJ for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:16 -0400 Received: from [140.186.70.92] (port=50481 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O5KrS-0007Z5-K0 for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O5KrQ-0005xH-Sz for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9965) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O5KrQ-0005wv-0c for qemu-devel@nongnu.org; Fri, 23 Apr 2010 11:32:08 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3NFW6tM021572 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 23 Apr 2010 11:32:06 -0400 Received: from localhost.localdomain (vpn2-9-155.ams2.redhat.com [10.36.9.155]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3NFVOCL020467; Fri, 23 Apr 2010 11:32:04 -0400 From: Kevin Wolf To: aliguori@linux.vnet.ibm.com Date: Fri, 23 Apr 2010 17:30:48 +0200 Message-Id: <1272036658-26776-17-git-send-email-kwolf@redhat.com> In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com> References: <1272036658-26776-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 16/26] 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 From: Christoph Hellwig Assign directly to the bdrv_flags variable instead of using magic numbers before translating to the BDRV_O_* options. Signed-off-by: Christoph Hellwig Signed-off-by: Kevin Wolf --- vl.c | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/vl.c b/vl.c index 0c76d33..a5a0f41 100644 --- a/vl.c +++ b/vl.c @@ -783,10 +783,8 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, 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; @@ -795,7 +793,6 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, *fatal_error = 1; translation = BIOS_ATA_TRANSLATION_AUTO; - cache = 1; if (machine && machine->use_scsi) { type = IF_SCSI; @@ -909,13 +906,13 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, } 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; } @@ -923,11 +920,11 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, #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; } @@ -1101,20 +1098,10 @@ DriveInfo *drive_init(QemuOpts *opts, void *opaque, *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 (media == MEDIA_CDROM) {