From patchwork Tue Apr 13 09:29:35 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 50055 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 18975B7CFA for ; Tue, 13 Apr 2010 19:37:45 +1000 (EST) Received: from localhost ([127.0.0.1]:51018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1cYv-0001lR-8K for incoming@patchwork.ozlabs.org; Tue, 13 Apr 2010 05:37:41 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1cRQ-0008Q1-TC for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:56 -0400 Received: from [140.186.70.92] (port=35834 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1cRO-0008PE-1J for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1cQZ-0001Je-RF for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:13 -0400 Received: from mtagate5.de.ibm.com ([195.212.17.165]:47986) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1cQZ-0001JG-FI for qemu-devel@nongnu.org; Tue, 13 Apr 2010 05:29:03 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate5.de.ibm.com (8.13.1/8.13.1) with ESMTP id o3D9T24t003381 for ; Tue, 13 Apr 2010 09:29:02 GMT Received: from d12av02.megacenter.de.ibm.com (d12av02.megacenter.de.ibm.com [9.149.165.228]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o3D9T2YR1507440 for ; Tue, 13 Apr 2010 11:29:02 +0200 Received: from d12av02.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id o3D9T1C0025573 for ; Tue, 13 Apr 2010 11:29:01 +0200 Received: from localhost.localdomain (dyn-9-174-219-79.manchester-maybrook.uk.ibm.com [9.174.219.79]) by d12av02.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id o3D9Sx8q025477; Tue, 13 Apr 2010 11:29:01 +0200 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Date: Tue, 13 Apr 2010 10:29:35 +0100 Message-Id: <1271150975-4456-4-git-send-email-stefanha@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271150975-4456-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1271150975-4456-1-git-send-email-stefanha@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Cc: kwolf@redhat.com, Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 3/3] qemu-img: Fix BRDV_O_FLAGS typo 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 It should be BDRV_O_FLAGS instead of BRDV_O_FLAGS. Signed-off-by: Stefan Hajnoczi --- qemu-img.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b30effa..7203b8b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -37,7 +37,7 @@ typedef struct img_cmd_t { } img_cmd_t; /* Default to cache=writeback as data integrity is not important for qemu-tcg. */ -#define BRDV_O_FLAGS BDRV_O_CACHE_WB +#define BDRV_O_FLAGS BDRV_O_CACHE_WB static void QEMU_NORETURN error(const char *fmt, ...) { @@ -345,7 +345,7 @@ static int img_create(int argc, char **argv) } } - bs = bdrv_new_open(backing_file->value.s, fmt, BRDV_O_FLAGS); + bs = bdrv_new_open(backing_file->value.s, fmt, BDRV_O_FLAGS); bdrv_get_geometry(bs, &size); size *= 512; bdrv_delete(bs); @@ -400,7 +400,7 @@ static int img_check(int argc, char **argv) help(); filename = argv[optind++]; - bs = bdrv_new_open(filename, fmt, BRDV_O_FLAGS); + bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS); ret = bdrv_check(bs); switch(ret) { case 0: @@ -446,7 +446,7 @@ static int img_commit(int argc, char **argv) help(); filename = argv[optind++]; - bs = bdrv_new_open(filename, fmt, BRDV_O_FLAGS | BDRV_O_RDWR); + bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_RDWR); ret = bdrv_commit(bs); switch(ret) { case 0: @@ -603,7 +603,7 @@ static int img_convert(int argc, char **argv) total_sectors = 0; for (bs_i = 0; bs_i < bs_n; bs_i++) { - bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BRDV_O_FLAGS); + bs[bs_i] = bdrv_new_open(argv[optind + bs_i], fmt, BDRV_O_FLAGS); if (!bs[bs_i]) error("Could not open '%s'", argv[optind + bs_i]); bdrv_get_geometry(bs[bs_i], &bs_sectors); @@ -661,7 +661,7 @@ static int img_convert(int argc, char **argv) } } - out_bs = bdrv_new_open(out_filename, out_fmt, BRDV_O_FLAGS | BDRV_O_RDWR); + out_bs = bdrv_new_open(out_filename, out_fmt, BDRV_O_FLAGS | BDRV_O_RDWR); bs_i = 0; bs_offset = 0; @@ -885,7 +885,7 @@ static int img_info(int argc, char **argv) help(); filename = argv[optind++]; - bs = bdrv_new_open(filename, fmt, BRDV_O_FLAGS | BDRV_O_NO_BACKING); + bs = bdrv_new_open(filename, fmt, BDRV_O_FLAGS | BDRV_O_NO_BACKING); bdrv_get_format(bs, fmt_name, sizeof(fmt_name)); bdrv_get_geometry(bs, &total_sectors); get_human_readable_size(size_buf, sizeof(size_buf), total_sectors * 512); @@ -1075,7 +1075,7 @@ static int img_rebase(int argc, char **argv) * Ignore the old backing file for unsafe rebase in case we want to correct * the reference to a renamed or moved backing file. */ - flags = BRDV_O_FLAGS | BDRV_O_RDWR | (unsafe ? BDRV_O_NO_BACKING : 0); + flags = BDRV_O_FLAGS | BDRV_O_RDWR | (unsafe ? BDRV_O_NO_BACKING : 0); bs = bdrv_new_open(filename, fmt, flags); /* Find the right drivers for the backing files */ @@ -1106,7 +1106,7 @@ static int img_rebase(int argc, char **argv) bs_old_backing = bdrv_new("old_backing"); bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name)); - if (bdrv_open(bs_old_backing, backing_name, BRDV_O_FLAGS, + if (bdrv_open(bs_old_backing, backing_name, BDRV_O_FLAGS, old_backing_drv)) { error("Could not open old backing file '%s'", backing_name); @@ -1114,7 +1114,7 @@ static int img_rebase(int argc, char **argv) } bs_new_backing = bdrv_new("new_backing"); - if (bdrv_open(bs_new_backing, out_baseimg, BRDV_O_FLAGS | BDRV_O_RDWR, + if (bdrv_open(bs_new_backing, out_baseimg, BDRV_O_FLAGS | BDRV_O_RDWR, new_backing_drv)) { error("Could not open new backing file '%s'", out_baseimg);