tests/tco: Make test independent of global_qtest

[qemu.git] / qemu-io-cmds.c

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 5363482213bf97e78dfea11dbf9ab43e0ccc9b23..8826bebaf6b5ded406b618324205de8ad3b44328 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"

+#include "qapi/qmp/qdict.h"

 #include "qemu-io.h"
 #include "sysemu/block-backend.h"
 #include "block/block.h"
 #include "qemu-io.h"
 #include "sysemu/block-backend.h"
 #include "block/block.h"


@@ -113,7 +114,7 @@ static int command(BlockBackend *blk, const cmdinfo_t *ct, int argc,
         }
     }
 
         }
     }
 

-    optind = 0;
+    qemu_reset_optind();

     return ct->cfunc(blk, argc, argv);
 }
 
     return ct->cfunc(blk, argc, argv);
 }
 


@@ -945,6 +946,7 @@ static void write_help(void)
 " -b, -- write to the VM state rather than the virtual disk\n"
 " -c, -- write compressed data with blk_write_compressed\n"
 " -f, -- use Force Unit Access semantics\n"
 " -b, -- write to the VM state rather than the virtual disk\n"
 " -c, -- write compressed data with blk_write_compressed\n"
 " -f, -- use Force Unit Access semantics\n"

+" -n, -- with -z, don't allow slow fallback\n"

 " -p, -- ignored for backwards compatibility\n"
 " -P, -- use different pattern to fill file\n"
 " -C, -- report statistics in a machine parsable format\n"
 " -p, -- ignored for backwards compatibility\n"
 " -P, -- use different pattern to fill file\n"
 " -C, -- report statistics in a machine parsable format\n"


@@ -963,7 +965,7 @@ static const cmdinfo_t write_cmd = {
     .perm       = BLK_PERM_WRITE,
     .argmin     = 2,
     .argmax     = -1,
     .perm       = BLK_PERM_WRITE,
     .argmin     = 2,
     .argmax     = -1,

-    .args       = "[-bcCfquz] [-P pattern] off len",
+    .args       = "[-bcCfnquz] [-P pattern] off len",

     .oneline    = "writes a number of bytes at a specified offset",
     .help       = write_help,
 };
     .oneline    = "writes a number of bytes at a specified offset",
     .help       = write_help,
 };


@@ -982,7 +984,7 @@ static int write_f(BlockBackend *blk, int argc, char **argv)
     int64_t total = 0;
     int pattern = 0xcd;
 
     int64_t total = 0;
     int pattern = 0xcd;
 

-    while ((c = getopt(argc, argv, "bcCfpP:quz")) != -1) {
+    while ((c = getopt(argc, argv, "bcCfnpP:quz")) != -1) {

         switch (c) {
         case 'b':
             bflag = true;
         switch (c) {
         case 'b':
             bflag = true;


@@ -996,6 +998,9 @@ static int write_f(BlockBackend *blk, int argc, char **argv)
         case 'f':
             flags |= BDRV_REQ_FUA;
             break;
         case 'f':
             flags |= BDRV_REQ_FUA;
             break;

+        case 'n':
+            flags |= BDRV_REQ_NO_FALLBACK;
+            break;

         case 'p':
             /* Ignored for backwards compatibility */
             break;
         case 'p':
             /* Ignored for backwards compatibility */
             break;


@@ -1036,6 +1041,11 @@ static int write_f(BlockBackend *blk, int argc, char **argv)
         return -EINVAL;
     }
 
         return -EINVAL;
     }
 

+    if ((flags & BDRV_REQ_NO_FALLBACK) && !zflag) {
+        printf("-n requires -z to be specified\n");
+        return -EINVAL;
+    }
+

     if ((flags & BDRV_REQ_MAY_UNMAP) && !zflag) {
         printf("-u requires -z to be specified\n");
         return -EINVAL;
     if ((flags & BDRV_REQ_MAY_UNMAP) && !zflag) {
         printf("-u requires -z to be specified\n");
         return -EINVAL;


@@ -1660,6 +1670,7 @@ static int info_f(BlockBackend *blk, int argc, char **argv)
     BlockDriverState *bs = blk_bs(blk);
     BlockDriverInfo bdi;
     ImageInfoSpecific *spec_info;
     BlockDriverState *bs = blk_bs(blk);
     BlockDriverInfo bdi;
     ImageInfoSpecific *spec_info;

+    Error *local_err = NULL;

     char s1[64], s2[64];
     int ret;
 
     char s1[64], s2[64];
     int ret;
 


@@ -1681,10 +1692,14 @@ static int info_f(BlockBackend *blk, int argc, char **argv)
     printf("cluster size: %s\n", s1);
     printf("vm state offset: %s\n", s2);
 
     printf("cluster size: %s\n", s1);
     printf("vm state offset: %s\n", s2);
 

-    spec_info = bdrv_get_specific_info(bs);
+    spec_info = bdrv_get_specific_info(bs, &local_err);
+    if (local_err) {
+        error_report_err(local_err);
+        return -EIO;
+    }

     if (spec_info) {
         printf("Format specific information:\n");
     if (spec_info) {
         printf("Format specific information:\n");

-        bdrv_image_info_specific_dump(fprintf, stdout, spec_info);
+        bdrv_image_info_specific_dump(spec_info);

         qapi_free_ImageInfoSpecific(spec_info);
     }
 
         qapi_free_ImageInfoSpecific(spec_info);
     }
 


@@ -1978,6 +1993,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
     int flags = bs->open_flags;
     bool writethrough = !blk_enable_write_cache(blk);
     bool has_rw_option = false;
     int flags = bs->open_flags;
     bool writethrough = !blk_enable_write_cache(blk);
     bool has_rw_option = false;

+    bool has_cache_option = false;

 
     BlockReopenQueue *brq;
     Error *local_err = NULL;
 
     BlockReopenQueue *brq;
     Error *local_err = NULL;


@@ -1989,6 +2005,7 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
                 error_report("Invalid cache option: %s", optarg);
                 return -EINVAL;
             }
                 error_report("Invalid cache option: %s", optarg);
                 return -EINVAL;
             }

+            has_cache_option = true;

             break;
         case 'o':
             if (!qemu_opts_parse_noisily(&reopen_opts, optarg, 0)) {
             break;
         case 'o':
             if (!qemu_opts_parse_noisily(&reopen_opts, optarg, 0)) {


@@ -2046,12 +2063,34 @@ static int reopen_f(BlockBackend *blk, int argc, char **argv)
     }
 
     qopts = qemu_opts_find(&reopen_opts, NULL);
     }
 
     qopts = qemu_opts_find(&reopen_opts, NULL);

-    opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : NULL;
+    opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : qdict_new();

     qemu_opts_reset(&reopen_opts);
 
     qemu_opts_reset(&reopen_opts);
 

+    if (qdict_haskey(opts, BDRV_OPT_READ_ONLY)) {
+        if (has_rw_option) {
+            error_report("Cannot set both -r/-w and '" BDRV_OPT_READ_ONLY "'");
+            qobject_unref(opts);
+            return -EINVAL;
+        }
+    } else {
+        qdict_put_bool(opts, BDRV_OPT_READ_ONLY, !(flags & BDRV_O_RDWR));
+    }
+
+    if (qdict_haskey(opts, BDRV_OPT_CACHE_DIRECT) ||
+        qdict_haskey(opts, BDRV_OPT_CACHE_NO_FLUSH)) {
+        if (has_cache_option) {
+            error_report("Cannot set both -c and the cache options");
+            qobject_unref(opts);
+            return -EINVAL;
+        }
+    } else {
+        qdict_put_bool(opts, BDRV_OPT_CACHE_DIRECT, flags & BDRV_O_NOCACHE);
+        qdict_put_bool(opts, BDRV_OPT_CACHE_NO_FLUSH, flags & BDRV_O_NO_FLUSH);
+    }
+

     bdrv_subtree_drained_begin(bs);
     bdrv_subtree_drained_begin(bs);

-    brq = bdrv_reopen_queue(NULL, bs, opts, flags);
-    bdrv_reopen_multiple(bdrv_get_aio_context(bs), brq, &local_err);
+    brq = bdrv_reopen_queue(NULL, bs, opts, true);
+    bdrv_reopen_multiple(brq, &local_err);

     bdrv_subtree_drained_end(bs);
 
     if (local_err) {
     bdrv_subtree_drained_end(bs);
 
     if (local_err) {