From c943656faab516dc817ab659056cedc141d36d4a Mon Sep 17 00:00:00 2001 From: Kevin Wolf Date: Mon, 15 Nov 2010 17:16:30 -0200 Subject: [RHEL6 qemu-kvm PATCH 01/21] cleanup block driver option handling in vl.c RH-Author: Kevin Wolf Message-id: <1289841395-30386-2-git-send-email-kwolf@redhat.com> Patchwork-id: 13563 O-Subject: [RHEL-6.1 qemu-kvm PATCH 1/6] cleanup block driver option handling in vl.c Bugzilla: 653536 RH-Acked-by: Amit Shah RH-Acked-by: Jes Sorensen RH-Acked-by: Christoph Hellwig From: Christoph Hellwig Bugzilla: 653536 Included to allow a clean cherry-pick of following patches 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 (cherry picked from commit 763b6084baaf7d4e8b93f8b74f23a37b2fdb4eb4) --- vl.c | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) Signed-off-by: Eduardo Habkost --- vl.c | 45 ++++++++++++++++----------------------------- 1 files changed, 16 insertions(+), 29 deletions(-) diff --git a/vl.c b/vl.c index cda2d96..d19a3e9 100644 --- a/vl.c +++ b/vl.c @@ -2194,10 +2194,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; @@ -2207,7 +2205,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; @@ -2321,13 +2318,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; } @@ -2335,11 +2332,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; } @@ -2522,20 +2519,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) { -- 1.7.3.2