tests/tco: Make test independent of global_qtest

[qemu.git] / qemu-img.c

diff --git a/qemu-img.c b/qemu-img.c
index 76a961df8247ac7018b6dfd6722fb7ef03732006..e6ad5978e0ce186e709365aeb512ae4383340f64 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -85,13 +85,11 @@ static void QEMU_NORETURN GCC_FMT_ATTR(1, 2) error_exit(const char *fmt, ...)
 {
     va_list ap;
 
 {
     va_list ap;
 

-    error_printf("qemu-img: ");
-

     va_start(ap, fmt);
     va_start(ap, fmt);

-    error_vprintf(fmt, ap);
+    error_vreport(fmt, ap);

     va_end(ap);
 
     va_end(ap);
 

-    error_printf("\nTry 'qemu-img --help' for more information\n");
+    error_printf("Try 'qemu-img --help' for more information\n");

     exit(EXIT_FAILURE);
 }
 
     exit(EXIT_FAILURE);
 }
 


@@ -269,9 +267,20 @@ static int print_block_option_help(const char *filename, const char *fmt)
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
     }
 
         create_opts = qemu_opts_append(create_opts, proto_drv->create_opts);
     }
 

-    printf("Supported options:\n");
+    if (filename) {
+        printf("Supported options:\n");
+    } else {
+        printf("Supported %s options:\n", fmt);
+    }

     qemu_opts_print_help(create_opts, false);
     qemu_opts_free(create_opts);
     qemu_opts_print_help(create_opts, false);
     qemu_opts_free(create_opts);

+
+    if (!filename) {
+        printf("\n"
+               "The protocol level may support further options.\n"
+               "Specify the target filename to include those options.\n");
+    }
+

     return 0;
 }
 
     return 0;
 }
 


@@ -1671,7 +1680,6 @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
                                         int nb_sectors, uint8_t *buf)
 {
     int n, ret;
                                         int nb_sectors, uint8_t *buf)
 {
     int n, ret;

-    QEMUIOVector qiov;

 
     assert(nb_sectors <= s->buf_sectors);
     while (nb_sectors > 0) {
 
     assert(nb_sectors <= s->buf_sectors);
     while (nb_sectors > 0) {


@@ -1687,11 +1695,10 @@ static int coroutine_fn convert_co_read(ImgConvertState *s, int64_t sector_num,
         bs_sectors = s->src_sectors[src_cur];
 
         n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));
         bs_sectors = s->src_sectors[src_cur];
 
         n = MIN(nb_sectors, bs_sectors - (sector_num - src_cur_offset));

-        qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);

 
 

-        ret = blk_co_preadv(
+        ret = blk_co_pread(

                 blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,
                 blk, (sector_num - src_cur_offset) << BDRV_SECTOR_BITS,

-                n << BDRV_SECTOR_BITS, &qiov, 0);
+                n << BDRV_SECTOR_BITS, buf, 0);

         if (ret < 0) {
             return ret;
         }
         if (ret < 0) {
             return ret;
         }


@@ -1710,7 +1717,6 @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
                                          enum ImgConvertBlockStatus status)
 {
     int ret;
                                          enum ImgConvertBlockStatus status)
 {
     int ret;

-    QEMUIOVector qiov;

 
     while (nb_sectors > 0) {
         int n = nb_sectors;
 
     while (nb_sectors > 0) {
         int n = nb_sectors;


@@ -1738,10 +1744,8 @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
                 (s->compressed &&
                  !buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)))
             {
                 (s->compressed &&
                  !buffer_is_zero(buf, n * BDRV_SECTOR_SIZE)))
             {

-                qemu_iovec_init_buf(&qiov, buf, n << BDRV_SECTOR_BITS);
-
-                ret = blk_co_pwritev(s->target, sector_num << BDRV_SECTOR_BITS,
-                                     n << BDRV_SECTOR_BITS, &qiov, flags);
+                ret = blk_co_pwrite(s->target, sector_num << BDRV_SECTOR_BITS,
+                                    n << BDRV_SECTOR_BITS, buf, flags);

                 if (ret < 0) {
                     return ret;
                 }
                 if (ret < 0) {
                     return ret;
                 }


@@ -1756,7 +1760,8 @@ static int coroutine_fn convert_co_write(ImgConvertState *s, int64_t sector_num,
             }
             ret = blk_co_pwrite_zeroes(s->target,
                                        sector_num << BDRV_SECTOR_BITS,
             }
             ret = blk_co_pwrite_zeroes(s->target,
                                        sector_num << BDRV_SECTOR_BITS,

-                                       n << BDRV_SECTOR_BITS, 0);
+                                       n << BDRV_SECTOR_BITS,
+                                       BDRV_REQ_MAY_UNMAP);

             if (ret < 0) {
                 return ret;
             }
             if (ret < 0) {
                 return ret;
             }


@@ -2484,11 +2489,11 @@ static void dump_snapshots(BlockDriverState *bs)
     if (nb_sns <= 0)
         return;
     printf("Snapshot list:\n");
     if (nb_sns <= 0)
         return;
     printf("Snapshot list:\n");

-    bdrv_snapshot_dump(fprintf, stdout, NULL);
+    bdrv_snapshot_dump(NULL);

     printf("\n");
     for(i = 0; i < nb_sns; i++) {
         sn = &sn_tab[i];
     printf("\n");
     for(i = 0; i < nb_sns; i++) {
         sn = &sn_tab[i];

-        bdrv_snapshot_dump(fprintf, stdout, sn);
+        bdrv_snapshot_dump(sn);

         printf("\n");
     }
     g_free(sn_tab);
         printf("\n");
     }
     g_free(sn_tab);


@@ -2537,7 +2542,7 @@ static void dump_human_image_info_list(ImageInfoList *list)
         }
         delim = true;
 
         }
         delim = true;
 

-        bdrv_image_info_dump(fprintf, stdout, elem->value);
+        bdrv_image_info_dump(elem->value);

     }
 }
 
     }
 }
 


@@ -4922,8 +4927,8 @@ int main(int argc, char **argv)
     signal(SIGPIPE, SIG_IGN);
 #endif
 
     signal(SIGPIPE, SIG_IGN);
 #endif
 

+    error_init(argv[0]);

     module_call_init(MODULE_INIT_TRACE);
     module_call_init(MODULE_INIT_TRACE);

-    error_set_progname(argv[0]);

     qemu_init_exec_dir(argv[0]);
 
     if (qemu_init_main_loop(&local_error)) {
     qemu_init_exec_dir(argv[0]);
 
     if (qemu_init_main_loop(&local_error)) {