spice: use bottom half instead of refresh timer for cursor updates

[qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index bd5a2ae22ec91264cb31caefc9003ed9df70e23d..7876258fa92a254e9b64df239122e2df283b3707 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1126,7 +1126,6 @@ static int img_compare(int argc, char **argv)
 
     blk1 = img_open("image_1", filename1, fmt1, flags, true, quiet);
     if (!blk1) {
 
     blk1 = img_open("image_1", filename1, fmt1, flags, true, quiet);
     if (!blk1) {

-        error_report("Can't open file %s", filename1);

         ret = 2;
         goto out3;
     }
         ret = 2;
         goto out3;
     }


@@ -1134,7 +1133,6 @@ static int img_compare(int argc, char **argv)
 
     blk2 = img_open("image_2", filename2, fmt2, flags, true, quiet);
     if (!blk2) {
 
     blk2 = img_open("image_2", filename2, fmt2, flags, true, quiet);
     if (!blk2) {

-        error_report("Can't open file %s", filename2);

         ret = 2;
         goto out2;
     }
         ret = 2;
         goto out2;
     }


@@ -1482,7 +1480,6 @@ static int img_convert(int argc, char **argv)
                              true, quiet);
         g_free(id);
         if (!blk[bs_i]) {
                              true, quiet);
         g_free(id);
         if (!blk[bs_i]) {

-            error_report("Could not open '%s'", argv[optind + bs_i]);

             ret = -1;
             goto out;
         }
             ret = -1;
             goto out;
         }


@@ -1534,6 +1531,20 @@ static int img_convert(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

+    if (!drv->create_opts) {
+        error_report("Format driver '%s' does not support image creation",
+                     drv->format_name);
+        ret = -1;
+        goto out;
+    }
+
+    if (!proto_drv->create_opts) {
+        error_report("Protocol driver '%s' does not support image creation",
+                     proto_drv->format_name);
+        ret = -1;
+        goto out;
+    }
+

     create_opts = qemu_opts_append(create_opts, drv->create_opts);
     create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
 
     create_opts = qemu_opts_append(create_opts, drv->create_opts);
     create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
 


@@ -2871,6 +2882,12 @@ out:
     return 0;
 }
 
     return 0;
 }
 

+static void amend_status_cb(BlockDriverState *bs,
+                            int64_t offset, int64_t total_work_size)
+{
+    qemu_progress_print(100.f * offset / total_work_size, 0);
+}
+

 static int img_amend(int argc, char **argv)
 {
     int c, ret = 0;
 static int img_amend(int argc, char **argv)
 {
     int c, ret = 0;


@@ -2879,13 +2896,13 @@ static int img_amend(int argc, char **argv)
     QemuOpts *opts = NULL;
     const char *fmt = NULL, *filename, *cache;
     int flags;
     QemuOpts *opts = NULL;
     const char *fmt = NULL, *filename, *cache;
     int flags;

-    bool quiet = false;
+    bool quiet = false, progress = false;

     BlockBackend *blk = NULL;
     BlockDriverState *bs = NULL;
 
     cache = BDRV_DEFAULT_CACHE;
     for (;;) {
     BlockBackend *blk = NULL;
     BlockDriverState *bs = NULL;
 
     cache = BDRV_DEFAULT_CACHE;
     for (;;) {

-        c = getopt(argc, argv, "ho:f:t:q");
+        c = getopt(argc, argv, "ho:f:t:pq");

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


@@ -2915,6 +2932,9 @@ static int img_amend(int argc, char **argv)
             case 't':
                 cache = optarg;
                 break;
             case 't':
                 cache = optarg;
                 break;

+            case 'p':
+                progress = true;
+                break;

             case 'q':
                 quiet = true;
                 break;
             case 'q':
                 quiet = true;
                 break;


@@ -2925,6 +2945,11 @@ static int img_amend(int argc, char **argv)
         error_exit("Must specify options (-o)");
     }
 
         error_exit("Must specify options (-o)");
     }
 

+    if (quiet) {
+        progress = false;
+    }
+    qemu_progress_init(progress, 1.0);
+

     filename = (optind == argc - 1) ? argv[argc - 1] : NULL;
     if (fmt && has_help_option(options)) {
         /* If a format is explicitly specified (and possibly no filename is
     filename = (optind == argc - 1) ? argv[argc - 1] : NULL;
     if (fmt && has_help_option(options)) {
         /* If a format is explicitly specified (and possibly no filename is


@@ -2934,7 +2959,9 @@ static int img_amend(int argc, char **argv)
     }
 
     if (optind != argc - 1) {
     }
 
     if (optind != argc - 1) {

-        error_exit("Expecting one image file name");
+        error_report("Expecting one image file name");
+        ret = -1;
+        goto out;

     }
 
     flags = BDRV_O_FLAGS | BDRV_O_RDWR;
     }
 
     flags = BDRV_O_FLAGS | BDRV_O_RDWR;


@@ -2946,7 +2973,6 @@ static int img_amend(int argc, char **argv)
 
     blk = img_open("image", filename, fmt, flags, true, quiet);
     if (!blk) {
 
     blk = img_open("image", filename, fmt, flags, true, quiet);
     if (!blk) {

-        error_report("Could not open image '%s'", filename);

         ret = -1;
         goto out;
     }
         ret = -1;
         goto out;
     }


@@ -2960,6 +2986,13 @@ static int img_amend(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

+    if (!bs->drv->create_opts) {
+        error_report("Format driver '%s' does not support any options to amend",
+                     fmt);
+        ret = -1;
+        goto out;
+    }
+

     create_opts = qemu_opts_append(create_opts, bs->drv->create_opts);
     opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
     if (options && qemu_opts_do_parse(opts, options, NULL)) {
     create_opts = qemu_opts_append(create_opts, bs->drv->create_opts);
     opts = qemu_opts_create(create_opts, NULL, 0, &error_abort);
     if (options && qemu_opts_do_parse(opts, options, NULL)) {


@@ -2968,13 +3001,18 @@ static int img_amend(int argc, char **argv)
         goto out;
     }
 
         goto out;
     }
 

-    ret = bdrv_amend_options(bs, opts);
+    /* In case the driver does not call amend_status_cb() */
+    qemu_progress_print(0.f, 0);
+    ret = bdrv_amend_options(bs, opts, &amend_status_cb);
+    qemu_progress_print(100.f, 0);

     if (ret < 0) {
         error_report("Error while amending options: %s", strerror(-ret));
         goto out;
     }
 
 out:
     if (ret < 0) {
         error_report("Error while amending options: %s", strerror(-ret));
         goto out;
     }
 
 out:

+    qemu_progress_end();
+

     blk_unref(blk);
     qemu_opts_del(opts);
     qemu_opts_free(create_opts);
     blk_unref(blk);
     qemu_opts_del(opts);
     qemu_opts_free(create_opts);