qcow: document another weakness of qcow AES encryption

[qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index c7196362df8a05f3827ea96edcd355ae5276aad5..f7ffb79db6fcdc363fd5530fbf9c59d002c35357 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -28,6 +28,7 @@
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"

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

 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "qemu/option.h"
 #include "qemu/cutils.h"
 #include "qemu/config-file.h"
 #include "qemu/option.h"


@@ -59,6 +60,7 @@ enum {
     OPTION_PATTERN = 260,
     OPTION_FLUSH_INTERVAL = 261,
     OPTION_NO_DRAIN = 262,
     OPTION_PATTERN = 260,
     OPTION_FLUSH_INTERVAL = 261,
     OPTION_NO_DRAIN = 262,

+    OPTION_TARGET_IMAGE_OPTS = 263,

 };
 
 typedef enum OutputFormat {
 };
 
 typedef enum OutputFormat {


@@ -283,12 +285,21 @@ static int img_open_password(BlockBackend *blk, const char *filename,
 
 static BlockBackend *img_open_opts(const char *optstr,
                                    QemuOpts *opts, int flags, bool writethrough,
 
 static BlockBackend *img_open_opts(const char *optstr,
                                    QemuOpts *opts, int flags, bool writethrough,

-                                   bool quiet)
+                                   bool quiet, bool force_share)

 {
     QDict *options;
     Error *local_err = NULL;
     BlockBackend *blk;
     options = qemu_opts_to_qdict(opts, NULL);
 {
     QDict *options;
     Error *local_err = NULL;
     BlockBackend *blk;
     options = qemu_opts_to_qdict(opts, NULL);

+    if (force_share) {
+        if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)
+            && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {
+            error_report("--force-share/-U conflicts with image options");
+            QDECREF(options);
+            return NULL;
+        }
+        qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
+    }

     blk = blk_new_open(NULL, NULL, options, flags, &local_err);
     if (!blk) {
         error_reportf_err(local_err, "Could not open '%s': ", optstr);
     blk = blk_new_open(NULL, NULL, options, flags, &local_err);
     if (!blk) {
         error_reportf_err(local_err, "Could not open '%s': ", optstr);


@@ -304,18 +315,24 @@ static BlockBackend *img_open_opts(const char *optstr,
 }
 
 static BlockBackend *img_open_file(const char *filename,
 }
 
 static BlockBackend *img_open_file(const char *filename,

+                                   QDict *options,

                                    const char *fmt, int flags,
                                    const char *fmt, int flags,

-                                   bool writethrough, bool quiet)
+                                   bool writethrough, bool quiet,
+                                   bool force_share)

 {
     BlockBackend *blk;
     Error *local_err = NULL;
 {
     BlockBackend *blk;
     Error *local_err = NULL;

-    QDict *options = NULL;

 
 

-    if (fmt) {
+    if (!options) {

         options = qdict_new();
         options = qdict_new();

-        qdict_put(options, "driver", qstring_from_str(fmt));
+    }
+    if (fmt) {
+        qdict_put_str(options, "driver", fmt);

     }
 
     }
 

+    if (force_share) {
+        qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
+    }

     blk = blk_new_open(filename, NULL, options, flags, &local_err);
     if (!blk) {
         error_reportf_err(local_err, "Could not open '%s': ", filename);
     blk = blk_new_open(filename, NULL, options, flags, &local_err);
     if (!blk) {
         error_reportf_err(local_err, "Could not open '%s': ", filename);


@@ -331,10 +348,39 @@ static BlockBackend *img_open_file(const char *filename,
 }
 
 
 }
 
 

+static int img_add_key_secrets(void *opaque,
+                               const char *name, const char *value,
+                               Error **errp)
+{
+    QDict *options = opaque;
+
+    if (g_str_has_suffix(name, "key-secret")) {
+        qdict_put(options, name, qstring_from_str(value));
+    }
+
+    return 0;
+}
+
+static BlockBackend *img_open_new_file(const char *filename,
+                                       QemuOpts *create_opts,
+                                       const char *fmt, int flags,
+                                       bool writethrough, bool quiet,
+                                       bool force_share)
+{
+    QDict *options = NULL;
+
+    options = qdict_new();
+    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);
+
+    return img_open_file(filename, options, fmt, flags, writethrough, quiet,
+                         force_share);
+}
+
+

 static BlockBackend *img_open(bool image_opts,
                               const char *filename,
                               const char *fmt, int flags, bool writethrough,
 static BlockBackend *img_open(bool image_opts,
                               const char *filename,
                               const char *fmt, int flags, bool writethrough,

-                              bool quiet)
+                              bool quiet, bool force_share)

 {
     BlockBackend *blk;
     if (image_opts) {
 {
     BlockBackend *blk;
     if (image_opts) {


@@ -348,9 +394,11 @@ static BlockBackend *img_open(bool image_opts,
         if (!opts) {
             return NULL;
         }
         if (!opts) {
             return NULL;
         }

-        blk = img_open_opts(filename, opts, flags, writethrough, quiet);
+        blk = img_open_opts(filename, opts, flags, writethrough, quiet,
+                            force_share);

     } else {
     } else {

-        blk = img_open_file(filename, fmt, flags, writethrough, quiet);
+        blk = img_open_file(filename, NULL, fmt, flags, writethrough, quiet,
+                            force_share);

     }
     return blk;
 }
     }
     return blk;
 }


@@ -416,7 +464,7 @@ static int img_create(int argc, char **argv)
             {"object", required_argument, 0, OPTION_OBJECT},
             {0, 0, 0, 0}
         };
             {"object", required_argument, 0, OPTION_OBJECT},
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":F:b:f:he6o:q",
+        c = getopt_long(argc, argv, ":F:b:f:ho:q",

                         long_options, NULL);
         if (c == -1) {
             break;
                         long_options, NULL);
         if (c == -1) {
             break;


@@ -440,14 +488,6 @@ static int img_create(int argc, char **argv)
         case 'f':
             fmt = optarg;
             break;
         case 'f':
             fmt = optarg;
             break;

-        case 'e':
-            error_report("option -e is deprecated, please use \'-o "
-                  "encryption\' instead!");
-            goto fail;
-        case '6':
-            error_report("option -6 is deprecated, please use \'-o "
-                  "compat6\' instead!");
-            goto fail;

         case 'o':
             if (!is_valid_option_list(optarg)) {
                 error_report("Invalid option list: %s", optarg);
         case 'o':
             if (!is_valid_option_list(optarg)) {
                 error_report("Invalid option list: %s", optarg);


@@ -650,6 +690,7 @@ static int img_check(int argc, char **argv)
     ImageCheck *check;
     bool quiet = false;
     bool image_opts = false;
     ImageCheck *check;
     bool quiet = false;
     bool image_opts = false;

+    bool force_share = false;

 
     fmt = NULL;
     output = NULL;
 
     fmt = NULL;
     output = NULL;


@@ -664,9 +705,10 @@ static int img_check(int argc, char **argv)
             {"output", required_argument, 0, OPTION_OUTPUT},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"output", required_argument, 0, OPTION_OUTPUT},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":hf:r:T:q",
+        c = getopt_long(argc, argv, ":hf:r:T:qU",

                         long_options, &option_index);
         if (c == -1) {
             break;
                         long_options, &option_index);
         if (c == -1) {
             break;


@@ -705,6 +747,9 @@ static int img_check(int argc, char **argv)
         case 'q':
             quiet = true;
             break;
         case 'q':
             quiet = true;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,
         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,


@@ -744,7 +789,8 @@ static int img_check(int argc, char **argv)
         return 1;
     }
 
         return 1;
     }
 

-    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);
+    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,
+                   force_share);

     if (!blk) {
         return 1;
     }
     if (!blk) {
         return 1;
     }


@@ -833,22 +879,28 @@ static void common_block_job_cb(void *opaque, int ret)
 static void run_block_job(BlockJob *job, Error **errp)
 {
     AioContext *aio_context = blk_get_aio_context(job->blk);
 static void run_block_job(BlockJob *job, Error **errp)
 {
     AioContext *aio_context = blk_get_aio_context(job->blk);

+    int ret = 0;

 
 

-    /* FIXME In error cases, the job simply goes away and we access a dangling
-     * pointer below. */

     aio_context_acquire(aio_context);
     aio_context_acquire(aio_context);

+    block_job_ref(job);

     do {
         aio_poll(aio_context, true);
         qemu_progress_print(job->len ?
                             ((float)job->offset / job->len * 100.f) : 0.0f, 0);
     do {
         aio_poll(aio_context, true);
         qemu_progress_print(job->len ?
                             ((float)job->offset / job->len * 100.f) : 0.0f, 0);

-    } while (!job->ready);
+    } while (!job->ready && !job->completed);

 
 

-    block_job_complete_sync(job, errp);
+    if (!job->completed) {
+        ret = block_job_complete_sync(job, errp);
+    } else {
+        ret = job->ret;
+    }
+    block_job_unref(job);

     aio_context_release(aio_context);
 
     aio_context_release(aio_context);
 

-    /* A block job may finish instantaneously without publishing any progress,
-     * so just signal completion here */
-    qemu_progress_print(100.f, 0);
+    /* publish completion progress only when success */
+    if (!ret) {
+        qemu_progress_print(100.f, 0);
+    }

 }
 
 static int img_commit(int argc, char **argv)
 }
 
 static int img_commit(int argc, char **argv)


@@ -947,7 +999,8 @@ static int img_commit(int argc, char **argv)
         return 1;
     }
 
         return 1;
     }
 

-    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);
+    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,
+                   false);

     if (!blk) {
         return 1;
     }
     if (!blk) {
         return 1;
     }


@@ -1206,6 +1259,7 @@ static int img_compare(int argc, char **argv)
     int c, pnum;
     uint64_t progress_base;
     bool image_opts = false;
     int c, pnum;
     uint64_t progress_base;
     bool image_opts = false;

+    bool force_share = false;

 
     cache = BDRV_DEFAULT_CACHE;
     for (;;) {
 
     cache = BDRV_DEFAULT_CACHE;
     for (;;) {


@@ -1213,9 +1267,10 @@ static int img_compare(int argc, char **argv)
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":hf:F:T:pqs",
+        c = getopt_long(argc, argv, ":hf:F:T:pqsU",

                         long_options, NULL);
         if (c == -1) {
             break;
                         long_options, NULL);
         if (c == -1) {
             break;


@@ -1248,6 +1303,9 @@ static int img_compare(int argc, char **argv)
         case 's':
             strict = true;
             break;
         case 's':
             strict = true;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,
         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,


@@ -1293,13 +1351,15 @@ static int img_compare(int argc, char **argv)
         goto out3;
     }
 
         goto out3;
     }
 

-    blk1 = img_open(image_opts, filename1, fmt1, flags, writethrough, quiet);
+    blk1 = img_open(image_opts, filename1, fmt1, flags, writethrough, quiet,
+                    force_share);

     if (!blk1) {
         ret = 2;
         goto out3;
     }
 
     if (!blk1) {
         ret = 2;
         goto out3;
     }
 

-    blk2 = img_open(image_opts, filename2, fmt2, flags, writethrough, quiet);
+    blk2 = img_open(image_opts, filename2, fmt2, flags, writethrough, quiet,
+                    force_share);

     if (!blk2) {
         ret = 2;
         goto out2;
     if (!blk2) {
         ret = 2;
         goto out2;


@@ -1448,12 +1508,16 @@ static int img_compare(int argc, char **argv)
         }
 
         for (;;) {
         }
 
         for (;;) {

+            int64_t count;
+

             nb_sectors = sectors_to_process(total_sectors_over, sector_num);
             if (nb_sectors <= 0) {
                 break;
             }
             nb_sectors = sectors_to_process(total_sectors_over, sector_num);
             if (nb_sectors <= 0) {
                 break;
             }

-            ret = bdrv_is_allocated_above(blk_bs(blk_over), NULL, sector_num,
-                                          nb_sectors, &pnum);
+            ret = bdrv_is_allocated_above(blk_bs(blk_over), NULL,
+                                          sector_num * BDRV_SECTOR_SIZE,
+                                          nb_sectors * BDRV_SECTOR_SIZE,
+                                          &count);

             if (ret < 0) {
                 ret = 3;
                 error_report("Sector allocation test failed for %s",
             if (ret < 0) {
                 ret = 3;
                 error_report("Sector allocation test failed for %s",


@@ -1461,7 +1525,10 @@ static int img_compare(int argc, char **argv)
                 goto out;
 
             }
                 goto out;
 
             }

-            nb_sectors = pnum;
+            /* TODO relax this once bdrv_is_allocated_above does not enforce
+             * sector alignment */
+            assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE));
+            nb_sectors = count >> BDRV_SECTOR_BITS;

             if (ret) {
                 ret = check_empty_sectors(blk_over, sector_num, nb_sectors,
                                           filename_over, buf1, quiet);
             if (ret) {
                 ret = check_empty_sectors(blk_over, sector_num, nb_sectors,
                                           filename_over, buf1, quiet);


@@ -1733,13 +1800,13 @@ static void coroutine_fn convert_co_do_copy(void *opaque)
         qemu_co_mutex_lock(&s->lock);
         if (s->ret != -EINPROGRESS || s->sector_num >= s->total_sectors) {
             qemu_co_mutex_unlock(&s->lock);
         qemu_co_mutex_lock(&s->lock);
         if (s->ret != -EINPROGRESS || s->sector_num >= s->total_sectors) {
             qemu_co_mutex_unlock(&s->lock);

-            goto out;
+            break;

         }
         n = convert_iteration_sectors(s, s->sector_num);
         if (n < 0) {
             qemu_co_mutex_unlock(&s->lock);
             s->ret = n;
         }
         n = convert_iteration_sectors(s, s->sector_num);
         if (n < 0) {
             qemu_co_mutex_unlock(&s->lock);
             s->ret = n;

-            goto out;
+            break;

         }
         /* save current sector and allocation status to local variables */
         sector_num = s->sector_num;
         }
         /* save current sector and allocation status to local variables */
         sector_num = s->sector_num;


@@ -1764,7 +1831,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)
                 error_report("error while reading sector %" PRId64
                              ": %s", sector_num, strerror(-ret));
                 s->ret = ret;
                 error_report("error while reading sector %" PRId64
                              ": %s", sector_num, strerror(-ret));
                 s->ret = ret;

-                goto out;

             }
         } else if (!s->min_sparse && status == BLK_ZERO) {
             status = BLK_DATA;
             }
         } else if (!s->min_sparse && status == BLK_ZERO) {
             status = BLK_DATA;


@@ -1773,22 +1839,20 @@ static void coroutine_fn convert_co_do_copy(void *opaque)
 
         if (s->wr_in_order) {
             /* keep writes in order */
 
         if (s->wr_in_order) {
             /* keep writes in order */

-            while (s->wr_offs != sector_num) {
-                if (s->ret != -EINPROGRESS) {
-                    goto out;
-                }
+            while (s->wr_offs != sector_num && s->ret == -EINPROGRESS) {

                 s->wait_sector_num[index] = sector_num;
                 qemu_coroutine_yield();
             }
             s->wait_sector_num[index] = -1;
         }
 
                 s->wait_sector_num[index] = sector_num;
                 qemu_coroutine_yield();
             }
             s->wait_sector_num[index] = -1;
         }
 

-        ret = convert_co_write(s, sector_num, n, buf, status);
-        if (ret < 0) {
-            error_report("error while writing sector %" PRId64
-                         ": %s", sector_num, strerror(-ret));
-            s->ret = ret;
-            goto out;
+        if (s->ret == -EINPROGRESS) {
+            ret = convert_co_write(s, sector_num, n, buf, status);
+            if (ret < 0) {
+                error_report("error while writing sector %" PRId64
+                             ": %s", sector_num, strerror(-ret));
+                s->ret = ret;
+            }

         }
 
         if (s->wr_in_order) {
         }
 
         if (s->wr_in_order) {


@@ -1809,7 +1873,6 @@ static void coroutine_fn convert_co_do_copy(void *opaque)
         }
     }
 
         }
     }
 

-out:

     qemu_vfree(buf);
     s->co[index] = NULL;
     s->running_coroutines--;
     qemu_vfree(buf);
     s->co[index] = NULL;
     s->running_coroutines--;


@@ -1871,7 +1934,7 @@ static int convert_do_copy(ImgConvertState *s)
         qemu_coroutine_enter(s->co[i]);
     }
 
         qemu_coroutine_enter(s->co[i]);
     }
 

-    while (s->ret == -EINPROGRESS) {
+    while (s->running_coroutines) {

         main_loop_wait(false);
     }
 
         main_loop_wait(false);
     }
 


@@ -1889,10 +1952,10 @@ static int convert_do_copy(ImgConvertState *s)
 static int img_convert(int argc, char **argv)
 {
     int c, bs_i, flags, src_flags = 0;
 static int img_convert(int argc, char **argv)
 {
     int c, bs_i, flags, src_flags = 0;

-    const char *fmt = NULL, *out_fmt = "raw", *cache = "unsafe",
+    const char *fmt = NULL, *out_fmt = NULL, *cache = "unsafe",

                *src_cache = BDRV_DEFAULT_CACHE, *out_baseimg = NULL,
                *out_filename, *out_baseimg_param, *snapshot_name = NULL;
                *src_cache = BDRV_DEFAULT_CACHE, *out_baseimg = NULL,
                *out_filename, *out_baseimg_param, *snapshot_name = NULL;

-    BlockDriver *drv, *proto_drv;
+    BlockDriver *drv = NULL, *proto_drv = NULL;

     BlockDriverInfo bdi;
     BlockDriverState *out_bs;
     QemuOpts *opts = NULL, *sn_opts = NULL;
     BlockDriverInfo bdi;
     BlockDriverState *out_bs;
     QemuOpts *opts = NULL, *sn_opts = NULL;


@@ -1900,8 +1963,9 @@ static int img_convert(int argc, char **argv)
     char *options = NULL;
     Error *local_err = NULL;
     bool writethrough, src_writethrough, quiet = false, image_opts = false,
     char *options = NULL;
     Error *local_err = NULL;
     bool writethrough, src_writethrough, quiet = false, image_opts = false,

-         skip_create = false, progress = false;
+         skip_create = false, progress = false, tgt_image_opts = false;

     int64_t ret = -EINVAL;
     int64_t ret = -EINVAL;

+    bool force_share = false;

 
     ImgConvertState s = (ImgConvertState) {
         /* Need at least 4k of zeros for sparse detection */
 
     ImgConvertState s = (ImgConvertState) {
         /* Need at least 4k of zeros for sparse detection */


@@ -1916,9 +1980,11 @@ static int img_convert(int argc, char **argv)
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},
+            {"target-image-opts", no_argument, 0, OPTION_TARGET_IMAGE_OPTS},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":hf:O:B:ce6o:s:l:S:pt:T:qnm:W",
+        c = getopt_long(argc, argv, ":hf:O:B:co:s:l:S:pt:T:qnm:WU",

                         long_options, NULL);
         if (c == -1) {
             break;
                         long_options, NULL);
         if (c == -1) {
             break;


@@ -1945,14 +2011,6 @@ static int img_convert(int argc, char **argv)
         case 'c':
             s.compressed = true;
             break;
         case 'c':
             s.compressed = true;
             break;

-        case 'e':
-            error_report("option -e is deprecated, please use \'-o "
-                  "encryption\' instead!");
-            goto fail_getopt;
-        case '6':
-            error_report("option -6 is deprecated, please use \'-o "
-                  "compat6\' instead!");
-            goto fail_getopt;

         case 'o':
             if (!is_valid_option_list(optarg)) {
                 error_report("Invalid option list: %s", optarg);
         case 'o':
             if (!is_valid_option_list(optarg)) {
                 error_report("Invalid option list: %s", optarg);


@@ -2021,6 +2079,9 @@ static int img_convert(int argc, char **argv)
         case 'W':
             s.wr_in_order = false;
             break;
         case 'W':
             s.wr_in_order = false;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OBJECT: {
             QemuOpts *object_opts;
             object_opts = qemu_opts_parse_noisily(&qemu_object_opts,
         case OPTION_OBJECT: {
             QemuOpts *object_opts;
             object_opts = qemu_opts_parse_noisily(&qemu_object_opts,


@@ -2033,9 +2094,16 @@ static int img_convert(int argc, char **argv)
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;

+        case OPTION_TARGET_IMAGE_OPTS:
+            tgt_image_opts = true;
+            break;

         }
     }
 
         }
     }
 

+    if (!out_fmt && !tgt_image_opts) {
+        out_fmt = "raw";
+    }
+

     if (qemu_opts_foreach(&qemu_object_opts,
                           user_creatable_add_opts_foreach,
                           NULL, NULL)) {
     if (qemu_opts_foreach(&qemu_object_opts,
                           user_creatable_add_opts_foreach,
                           NULL, NULL)) {


@@ -2047,12 +2115,22 @@ static int img_convert(int argc, char **argv)
         goto fail_getopt;
     }
 
         goto fail_getopt;
     }
 

+    if (tgt_image_opts && !skip_create) {
+        error_report("--target-image-opts requires use of -n flag");
+        goto fail_getopt;
+    }
+

     s.src_num = argc - optind - 1;
     out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;
 
     if (options && has_help_option(options)) {
     s.src_num = argc - optind - 1;
     out_filename = s.src_num >= 1 ? argv[argc - 1] : NULL;
 
     if (options && has_help_option(options)) {

-        ret = print_block_option_help(out_filename, out_fmt);
-        goto fail_getopt;
+        if (out_fmt) {
+            ret = print_block_option_help(out_filename, out_fmt);
+            goto fail_getopt;
+        } else {
+            error_report("Option help requires a format be specified");
+            goto fail_getopt;
+        }

     }
 
     if (s.src_num < 1) {
     }
 
     if (s.src_num < 1) {


@@ -2080,7 +2158,8 @@ static int img_convert(int argc, char **argv)
 
     for (bs_i = 0; bs_i < s.src_num; bs_i++) {
         s.src[bs_i] = img_open(image_opts, argv[optind + bs_i],
 
     for (bs_i = 0; bs_i < s.src_num; bs_i++) {
         s.src[bs_i] = img_open(image_opts, argv[optind + bs_i],

-                               fmt, src_flags, src_writethrough, quiet);
+                               fmt, src_flags, src_writethrough, quiet,
+                               force_share);

         if (!s.src[bs_i]) {
             ret = -1;
             goto out;
         if (!s.src[bs_i]) {
             ret = -1;
             goto out;


@@ -2116,22 +2195,22 @@ static int img_convert(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    /* Find driver and parse its options */
-    drv = bdrv_find_format(out_fmt);
-    if (!drv) {
-        error_report("Unknown file format '%s'", out_fmt);
-        ret = -1;
-        goto out;
-    }
+    if (!skip_create) {
+        /* Find driver and parse its options */
+        drv = bdrv_find_format(out_fmt);
+        if (!drv) {
+            error_report("Unknown file format '%s'", out_fmt);
+            ret = -1;
+            goto out;
+        }

 
 

-    proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
-    if (!proto_drv) {
-        error_report_err(local_err);
-        ret = -1;
-        goto out;
-    }
+        proto_drv = bdrv_find_protocol(out_filename, true, &local_err);
+        if (!proto_drv) {
+            error_report_err(local_err);
+            ret = -1;
+            goto out;
+        }

 
 

-    if (!skip_create) {

         if (!drv->create_opts) {
             error_report("Format driver '%s' does not support image creation",
                          drv->format_name);
         if (!drv->create_opts) {
             error_report("Format driver '%s' does not support image creation",
                          drv->format_name);


@@ -2188,7 +2267,7 @@ static int img_convert(int argc, char **argv)
         const char *preallocation =
             qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
 
         const char *preallocation =
             qemu_opt_get(opts, BLOCK_OPT_PREALLOC);
 

-        if (!drv->bdrv_co_pwritev_compressed) {
+        if (drv && !drv->bdrv_co_pwritev_compressed) {

             error_report("Compression not supported for this file format");
             ret = -1;
             goto out;
             error_report("Compression not supported for this file format");
             ret = -1;
             goto out;


@@ -2228,18 +2307,30 @@ static int img_convert(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    /* XXX we should allow --image-opts to trigger use of
-     * img_open() here, but then we have trouble with
-     * the bdrv_create() call which takes different params.
-     * Not critical right now, so fix can wait...
-     */
-    s.target = img_open_file(out_filename, out_fmt, flags, writethrough, quiet);
+    if (skip_create) {
+        s.target = img_open(tgt_image_opts, out_filename, out_fmt,
+                            flags, writethrough, quiet, false);
+    } else {
+        /* TODO ultimately we should allow --target-image-opts
+         * to be used even when -n is not given.
+         * That has to wait for bdrv_create to be improved
+         * to allow filenames in option syntax
+         */
+        s.target = img_open_new_file(out_filename, opts, out_fmt,
+                                     flags, writethrough, quiet, false);
+    }

     if (!s.target) {
         ret = -1;
         goto out;
     }
     out_bs = blk_bs(s.target);
 
     if (!s.target) {
         ret = -1;
         goto out;
     }
     out_bs = blk_bs(s.target);
 

+    if (s.compressed && !out_bs->drv->bdrv_co_pwritev_compressed) {
+        error_report("Compression not supported for this file format");
+        ret = -1;
+        goto out;
+    }
+

     /* increase bufsectors from the default 4096 (2M) if opt_transfer
      * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB)
      * as maximum. */
     /* increase bufsectors from the default 4096 (2M) if opt_transfer
      * or discard_alignment of the out_bs is greater. Limit to 32768 (16MB)
      * as maximum. */


@@ -2384,7 +2475,7 @@ static gboolean str_equal_func(gconstpointer a, gconstpointer b)
 static ImageInfoList *collect_image_info_list(bool image_opts,
                                               const char *filename,
                                               const char *fmt,
 static ImageInfoList *collect_image_info_list(bool image_opts,
                                               const char *filename,
                                               const char *fmt,

-                                              bool chain)
+                                              bool chain, bool force_share)

 {
     ImageInfoList *head = NULL;
     ImageInfoList **last = &head;
 {
     ImageInfoList *head = NULL;
     ImageInfoList **last = &head;


@@ -2407,7 +2498,8 @@ static ImageInfoList *collect_image_info_list(bool image_opts,
         g_hash_table_insert(filenames, (gpointer)filename, NULL);
 
         blk = img_open(image_opts, filename, fmt,
         g_hash_table_insert(filenames, (gpointer)filename, NULL);
 
         blk = img_open(image_opts, filename, fmt,

-                       BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false);
+                       BDRV_O_NO_BACKING | BDRV_O_NO_IO, false, false,
+                       force_share);

         if (!blk) {
             goto err;
         }
         if (!blk) {
             goto err;
         }


@@ -2459,6 +2551,7 @@ static int img_info(int argc, char **argv)
     const char *filename, *fmt, *output;
     ImageInfoList *list;
     bool image_opts = false;
     const char *filename, *fmt, *output;
     ImageInfoList *list;
     bool image_opts = false;

+    bool force_share = false;

 
     fmt = NULL;
     output = NULL;
 
     fmt = NULL;
     output = NULL;


@@ -2471,9 +2564,10 @@ static int img_info(int argc, char **argv)
             {"backing-chain", no_argument, 0, OPTION_BACKING_CHAIN},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"backing-chain", no_argument, 0, OPTION_BACKING_CHAIN},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":f:h",
+        c = getopt_long(argc, argv, ":f:hU",

                         long_options, &option_index);
         if (c == -1) {
             break;
                         long_options, &option_index);
         if (c == -1) {
             break;


@@ -2491,6 +2585,9 @@ static int img_info(int argc, char **argv)
         case 'f':
             fmt = optarg;
             break;
         case 'f':
             fmt = optarg;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OUTPUT:
             output = optarg;
             break;
         case OPTION_OUTPUT:
             output = optarg;
             break;


@@ -2530,7 +2627,8 @@ static int img_info(int argc, char **argv)
         return 1;
     }
 
         return 1;
     }
 

-    list = collect_image_info_list(image_opts, filename, fmt, chain);
+    list = collect_image_info_list(image_opts, filename, fmt, chain,
+                                   force_share);

     if (!list) {
         return 1;
     }
     if (!list) {
         return 1;
     }


@@ -2676,6 +2774,7 @@ static int img_map(int argc, char **argv)
     MapEntry curr = { .length = 0 }, next;
     int ret = 0;
     bool image_opts = false;
     MapEntry curr = { .length = 0 }, next;
     int ret = 0;
     bool image_opts = false;

+    bool force_share = false;

 
     fmt = NULL;
     output = NULL;
 
     fmt = NULL;
     output = NULL;


@@ -2687,9 +2786,10 @@ static int img_map(int argc, char **argv)
             {"output", required_argument, 0, OPTION_OUTPUT},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"output", required_argument, 0, OPTION_OUTPUT},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":f:h",
+        c = getopt_long(argc, argv, ":f:hU",

                         long_options, &option_index);
         if (c == -1) {
             break;
                         long_options, &option_index);
         if (c == -1) {
             break;


@@ -2707,6 +2807,9 @@ static int img_map(int argc, char **argv)
         case 'f':
             fmt = optarg;
             break;
         case 'f':
             fmt = optarg;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OUTPUT:
             output = optarg;
             break;
         case OPTION_OUTPUT:
             output = optarg;
             break;


@@ -2743,7 +2846,7 @@ static int img_map(int argc, char **argv)
         return 1;
     }
 
         return 1;
     }
 

-    blk = img_open(image_opts, filename, fmt, 0, false, false);
+    blk = img_open(image_opts, filename, fmt, 0, false, false, force_share);

     if (!blk) {
         return 1;
     }
     if (!blk) {
         return 1;
     }


@@ -2806,6 +2909,7 @@ static int img_snapshot(int argc, char **argv)
     bool quiet = false;
     Error *err = NULL;
     bool image_opts = false;
     bool quiet = false;
     Error *err = NULL;
     bool image_opts = false;

+    bool force_share = false;

 
     bdrv_oflags = BDRV_O_RDWR;
     /* Parse commandline parameters */
 
     bdrv_oflags = BDRV_O_RDWR;
     /* Parse commandline parameters */


@@ -2814,9 +2918,10 @@ static int img_snapshot(int argc, char **argv)
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":la:c:d:hq",
+        c = getopt_long(argc, argv, ":la:c:d:hqU",

                         long_options, NULL);
         if (c == -1) {
             break;
                         long_options, NULL);
         if (c == -1) {
             break;


@@ -2866,6 +2971,9 @@ static int img_snapshot(int argc, char **argv)
         case 'q':
             quiet = true;
             break;
         case 'q':
             quiet = true;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,
         case OPTION_OBJECT: {
             QemuOpts *opts;
             opts = qemu_opts_parse_noisily(&qemu_object_opts,


@@ -2892,7 +3000,8 @@ static int img_snapshot(int argc, char **argv)
     }
 
     /* Open the image */
     }
 
     /* Open the image */

-    blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet);
+    blk = img_open(image_opts, filename, NULL, bdrv_oflags, false, quiet,
+                   force_share);

     if (!blk) {
         return 1;
     }
     if (!blk) {
         return 1;
     }


@@ -2956,6 +3065,7 @@ static int img_rebase(int argc, char **argv)
     int c, flags, src_flags, ret;
     bool writethrough, src_writethrough;
     int unsafe = 0;
     int c, flags, src_flags, ret;
     bool writethrough, src_writethrough;
     int unsafe = 0;

+    bool force_share = false;

     int progress = 0;
     bool quiet = false;
     Error *local_err = NULL;
     int progress = 0;
     bool quiet = false;
     Error *local_err = NULL;


@@ -2972,9 +3082,10 @@ static int img_rebase(int argc, char **argv)
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"help", no_argument, 0, 'h'},
             {"object", required_argument, 0, OPTION_OBJECT},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":hf:F:b:upt:T:q",
+        c = getopt_long(argc, argv, ":hf:F:b:upt:T:qU",

                         long_options, NULL);
         if (c == -1) {
             break;
                         long_options, NULL);
         if (c == -1) {
             break;


@@ -3024,6 +3135,9 @@ static int img_rebase(int argc, char **argv)
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;

+        case 'U':
+            force_share = true;
+            break;

         }
     }
 
         }
     }
 


@@ -3072,7 +3186,8 @@ 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.
      */
      * Ignore the old backing file for unsafe rebase in case we want to correct
      * the reference to a renamed or moved backing file.
      */

-    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);
+    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,
+                   false);

     if (!blk) {
         ret = -1;
         goto out;
     if (!blk) {
         ret = -1;
         goto out;


@@ -3094,9 +3209,15 @@ static int img_rebase(int argc, char **argv)
 
         if (bs->backing_format[0] != '\0') {
             options = qdict_new();
 
         if (bs->backing_format[0] != '\0') {
             options = qdict_new();

-            qdict_put(options, "driver", qstring_from_str(bs->backing_format));
+            qdict_put_str(options, "driver", bs->backing_format);

         }
 
         }
 

+        if (force_share) {
+            if (!options) {
+                options = qdict_new();
+            }
+            qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
+        }

         bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name));
         blk_old_backing = blk_new_open(backing_name, NULL,
                                        options, src_flags, &local_err);
         bdrv_get_backing_filename(bs, backing_name, sizeof(backing_name));
         blk_old_backing = blk_new_open(backing_name, NULL,
                                        options, src_flags, &local_err);


@@ -3109,11 +3230,12 @@ static int img_rebase(int argc, char **argv)
         }
 
         if (out_baseimg[0]) {
         }
 
         if (out_baseimg[0]) {

+            options = qdict_new();

             if (out_basefmt) {
             if (out_basefmt) {

-                options = qdict_new();
-                qdict_put(options, "driver", qstring_from_str(out_basefmt));
-            } else {
-                options = NULL;
+                qdict_put_str(options, "driver", out_basefmt);
+            }
+            if (force_share) {
+                qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);

             }
 
             blk_new_backing = blk_new_open(out_baseimg, NULL,
             }
 
             blk_new_backing = blk_new_open(out_baseimg, NULL,


@@ -3143,6 +3265,7 @@ static int img_rebase(int argc, char **argv)
         int64_t new_backing_num_sectors = 0;
         uint64_t sector;
         int n;
         int64_t new_backing_num_sectors = 0;
         uint64_t sector;
         int n;

+        int64_t count;

         float local_progress = 0;
 
         buf_old = blk_blockalign(blk, IO_BUF_SIZE);
         float local_progress = 0;
 
         buf_old = blk_blockalign(blk, IO_BUF_SIZE);


@@ -3190,12 +3313,17 @@ static int img_rebase(int argc, char **argv)
             }
 
             /* If the cluster is allocated, we don't need to take action */
             }
 
             /* If the cluster is allocated, we don't need to take action */

-            ret = bdrv_is_allocated(bs, sector, n, &n);
+            ret = bdrv_is_allocated(bs, sector << BDRV_SECTOR_BITS,
+                                    n << BDRV_SECTOR_BITS, &count);

             if (ret < 0) {
                 error_report("error while reading image metadata: %s",
                              strerror(-ret));
                 goto out;
             }
             if (ret < 0) {
                 error_report("error while reading image metadata: %s",
                              strerror(-ret));
                 goto out;
             }

+            /* TODO relax this once bdrv_is_allocated does not enforce
+             * sector alignment */
+            assert(QEMU_IS_ALIGNED(count, BDRV_SECTOR_SIZE));
+            n = count >> BDRV_SECTOR_BITS;

             if (ret) {
                 continue;
             }
             if (ret) {
                 continue;
             }


@@ -3419,7 +3547,8 @@ static int img_resize(int argc, char **argv)
     qemu_opts_del(param);
 
     blk = img_open(image_opts, filename, fmt,
     qemu_opts_del(param);
 
     blk = img_open(image_opts, filename, fmt,

-                   BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet);
+                   BDRV_O_RDWR | BDRV_O_RESIZE, false, quiet,
+                   false);

     if (!blk) {
         ret = -1;
         goto out;
     if (!blk) {
         ret = -1;
         goto out;


@@ -3573,7 +3702,8 @@ static int img_amend(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);
+    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,
+                   false);

     if (!blk) {
         ret = -1;
         goto out;
     if (!blk) {
         ret = -1;
         goto out;


@@ -3741,6 +3871,7 @@ static int img_bench(int argc, char **argv)
     bool writethrough = false;
     struct timeval t1, t2;
     int i;
     bool writethrough = false;
     struct timeval t1, t2;
     int i;

+    bool force_share = false;

 
     for (;;) {
         static const struct option long_options[] = {
 
     for (;;) {
         static const struct option long_options[] = {


@@ -3749,9 +3880,10 @@ static int img_bench(int argc, char **argv)
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"pattern", required_argument, 0, OPTION_PATTERN},
             {"no-drain", no_argument, 0, OPTION_NO_DRAIN},
             {"image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
             {"pattern", required_argument, 0, OPTION_PATTERN},
             {"no-drain", no_argument, 0, OPTION_NO_DRAIN},

+            {"force-share", no_argument, 0, 'U'},

             {0, 0, 0, 0}
         };
             {0, 0, 0, 0}
         };

-        c = getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:w", long_options, NULL);
+        c = getopt_long(argc, argv, ":hc:d:f:no:qs:S:t:wU", long_options, NULL);

         if (c == -1) {
             break;
         }
         if (c == -1) {
             break;
         }


@@ -3845,6 +3977,9 @@ static int img_bench(int argc, char **argv)
             flags |= BDRV_O_RDWR;
             is_write = true;
             break;
             flags |= BDRV_O_RDWR;
             is_write = true;
             break;

+        case 'U':
+            force_share = true;
+            break;

         case OPTION_PATTERN:
         {
             unsigned long res;
         case OPTION_PATTERN:
         {
             unsigned long res;


@@ -3892,7 +4027,8 @@ static int img_bench(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet);
+    blk = img_open(image_opts, filename, fmt, flags, writethrough, quiet,
+                   force_share);

     if (!blk) {
         ret = -1;
         goto out;
     if (!blk) {
         ret = -1;
         goto out;


@@ -4059,6 +4195,7 @@ static int img_dd(int argc, char **argv)
     const char *fmt = NULL;
     int64_t size = 0;
     int64_t block_count = 0, out_pos, in_pos;
     const char *fmt = NULL;
     int64_t size = 0;
     int64_t block_count = 0, out_pos, in_pos;

+    bool force_share = false;

     struct DdInfo dd = {
         .flags = 0,
         .count = 0,
     struct DdInfo dd = {
         .flags = 0,
         .count = 0,


@@ -4086,11 +4223,13 @@ static int img_dd(int argc, char **argv)
     };
     const struct option long_options[] = {
         { "help", no_argument, 0, 'h'},
     };
     const struct option long_options[] = {
         { "help", no_argument, 0, 'h'},

+        { "object", required_argument, 0, OPTION_OBJECT},

         { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},
         { "image-opts", no_argument, 0, OPTION_IMAGE_OPTS},

+        { "force-share", no_argument, 0, 'U'},

         { 0, 0, 0, 0 }
     };
 
         { 0, 0, 0, 0 }
     };
 

-    while ((c = getopt_long(argc, argv, ":hf:O:", long_options, NULL))) {
+    while ((c = getopt_long(argc, argv, ":hf:O:U", long_options, NULL))) {

         if (c == EOF) {
             break;
         }
         if (c == EOF) {
             break;
         }


@@ -4110,6 +4249,15 @@ static int img_dd(int argc, char **argv)
         case 'h':
             help();
             break;
         case 'h':
             help();
             break;

+        case 'U':
+            force_share = true;
+            break;
+        case OPTION_OBJECT:
+            if (!qemu_opts_parse_noisily(&qemu_object_opts, optarg, true)) {
+                ret = -1;
+                goto out;
+            }
+            break;

         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;
         case OPTION_IMAGE_OPTS:
             image_opts = true;
             break;


@@ -4154,7 +4302,16 @@ static int img_dd(int argc, char **argv)
         ret = -1;
         goto out;
     }
         ret = -1;
         goto out;
     }

-    blk1 = img_open(image_opts, in.filename, fmt, 0, false, false);
+
+    if (qemu_opts_foreach(&qemu_object_opts,
+                          user_creatable_add_opts_foreach,
+                          NULL, NULL)) {
+        ret = -1;
+        goto out;
+    }
+
+    blk1 = img_open(image_opts, in.filename, fmt, 0, false, false,
+                    force_share);

 
     if (!blk1) {
         ret = -1;
 
     if (!blk1) {
         ret = -1;


@@ -4221,8 +4378,13 @@ static int img_dd(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    blk2 = img_open(image_opts, out.filename, out_fmt, BDRV_O_RDWR,
-                    false, false);
+    /* TODO, we can't honour --image-opts for the target,
+     * since it needs to be given in a format compatible
+     * with the bdrv_create() call above which does not
+     * support image-opts style.
+     */
+    blk2 = img_open_file(out.filename, NULL, out_fmt, BDRV_O_RDWR,
+                         false, false, false);

 
     if (!blk2) {
         ret = -1;
 
     if (!blk2) {
         ret = -1;