qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: aliguori@linux.vnet.ibm.com
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 23/26] qemu-img: Fix BRDV_O_FLAGS typo
Date: Fri, 23 Apr 2010 17:30:55 +0200	[thread overview]
Message-ID: <1272036658-26776-24-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1272036658-26776-1-git-send-email-kwolf@redhat.com>

From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>

It should be BDRV_O_FLAGS instead of BRDV_O_FLAGS.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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);
-- 
1.6.6.1

  parent reply	other threads:[~2010-04-23 15:32 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-23 15:30 [Qemu-devel] [PULL 00/26] Block patches Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 01/26] qemu-config: qemu_read_config_file() reads the normal config file Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 02/26] qemu-config: Make qemu_config_parse more generic Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 03/26] blkdebug: Basic request passthrough Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 04/26] blkdebug: Inject errors Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 05/26] Make qemu-config available for tools Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 06/26] blkdebug: Add events and rules Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 07/26] qcow2: Trigger blkdebug events Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 08/26] qcow2: Fix creation of large images Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 09/26] Replace calls of old bdrv_open Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 10/26] block: get rid of the BDRV_O_FILE flag Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 11/26] block: split raw_getlength Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 12/26] qcow2: Return 0/-errno in write_l2_entries Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 13/26] qcow2: Fix error return code in qcow2_alloc_cluster_link_l2 Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 14/26] qcow2: Return 0/-errno in write_l1_entry Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 15/26] qcow2: Return 0/-errno in l2_allocate Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 16/26] cleanup block driver option handling in vl.c Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 17/26] block: Do not export bdrv_first Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 18/26] block: Convert bdrv_first to QTAILQ Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 19/26] Remove un-needed code Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 20/26] block.h: bdrv_create2 doesn't exist any more Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 21/26] block: Convert first_drv to QLIST Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 22/26] qemu-img: Eliminate bdrv_new_open() code duplication Kevin Wolf
2010-04-23 15:30 ` Kevin Wolf [this message]
2010-04-23 15:30 ` [Qemu-devel] [PATCH 24/26] linux-aio: Fix typo in read() EINTR check Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 25/26] qcow2: Use QLIST_FOREACH_SAFE macro Kevin Wolf
2010-04-23 15:30 ` [Qemu-devel] [PATCH 26/26] block: Free iovec arrays allocated by multiwrite_merge() Kevin Wolf
2010-04-23 20:22   ` Ryan Harper
2010-04-25  1:42     ` Aurelien Jarno
2010-04-23 18:49 ` [Qemu-devel] Re: [PULL 00/26] Block patches Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1272036658-26776-24-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=aliguori@linux.vnet.ibm.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).