Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180716' into...

[qemu.git] / qemu-io.c

diff --git a/qemu-io.c b/qemu-io.c
index 34fa8a10a43204b6ad14696bf036a8dd32a79dca..13829f5e21ba84e5cce5c39d2228377456eeb9db 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -7,9 +7,13 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */

+

 #include "qemu/osdep.h"
 #include <getopt.h>
 #include <libgen.h>
 #include "qemu/osdep.h"
 #include <getopt.h>
 #include <libgen.h>

+#ifndef _WIN32
+#include <termios.h>
+#endif

 
 #include "qapi/error.h"
 #include "qemu-io.h"
 
 #include "qapi/error.h"
 #include "qemu-io.h"


@@ -20,18 +24,20 @@
 #include "qemu/readline.h"
 #include "qemu/log.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/readline.h"
 #include "qemu/log.h"
 #include "qapi/qmp/qstring.h"

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

 #include "qom/object_interfaces.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "trace/control.h"
 #include "crypto/init.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "trace/control.h"
 #include "crypto/init.h"

+#include "qemu-version.h"

 
 #define CMD_NOFILE_OK   0x01
 
 static char *progname;
 
 static BlockBackend *qemuio_blk;
 
 #define CMD_NOFILE_OK   0x01
 
 static char *progname;
 
 static BlockBackend *qemuio_blk;

+static bool quit_qemu_io;

 
 /* qemu-io commands passed using -c */
 static int ncmdline;
 
 /* qemu-io commands passed using -c */
 static int ncmdline;


@@ -40,6 +46,26 @@ static bool imageOpts;
 
 static ReadLineState *readline_state;
 
 
 static ReadLineState *readline_state;
 

+static int ttyEOF;
+
+static int get_eof_char(void)
+{
+#ifdef _WIN32
+    return 0x4; /* Ctrl-D */
+#else
+    struct termios tty;
+    if (tcgetattr(STDIN_FILENO, &tty) != 0) {
+        if (errno == ENOTTY) {
+            return 0x0; /* just expect read() == 0 */
+        } else {
+            return 0x4; /* Ctrl-D */
+        }
+    }
+
+    return tty.c_cc[VEOF];
+#endif
+}
+

 static int close_f(BlockBackend *blk, int argc, char **argv)
 {
     blk_unref(qemuio_blk);
 static int close_f(BlockBackend *blk, int argc, char **argv)
 {
     blk_unref(qemuio_blk);


@@ -58,11 +84,10 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
                     QDict *opts)
 {
     Error *local_err = NULL;
                     QDict *opts)
 {
     Error *local_err = NULL;

-    BlockDriverState *bs;

 
     if (qemuio_blk) {
         error_report("file open already, try 'help close'");
 
     if (qemuio_blk) {
         error_report("file open already, try 'help close'");

-        QDECREF(opts);
+        qobject_unref(opts);

         return 1;
     }
 
         return 1;
     }
 


@@ -71,12 +96,12 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
             opts = qdict_new();
         }
         if (qdict_haskey(opts, BDRV_OPT_FORCE_SHARE)
             opts = qdict_new();
         }
         if (qdict_haskey(opts, BDRV_OPT_FORCE_SHARE)

-            && !qdict_get_bool(opts, BDRV_OPT_FORCE_SHARE)) {
+            && strcmp(qdict_get_str(opts, BDRV_OPT_FORCE_SHARE), "on")) {

             error_report("-U conflicts with image options");
             error_report("-U conflicts with image options");

-            QDECREF(opts);
+            qobject_unref(opts);

             return 1;
         }
             return 1;
         }

-        qdict_put(opts, BDRV_OPT_FORCE_SHARE, qbool_from_bool(true));
+        qdict_put_str(opts, BDRV_OPT_FORCE_SHARE, "on");

     }
     qemuio_blk = blk_new_open(name, NULL, opts, flags, &local_err);
     if (!qemuio_blk) {
     }
     qemuio_blk = blk_new_open(name, NULL, opts, flags, &local_err);
     if (!qemuio_blk) {


@@ -85,28 +110,9 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
         return 1;
     }
 
         return 1;
     }
 

-    bs = blk_bs(qemuio_blk);
-    if (bdrv_is_encrypted(bs) && bdrv_key_required(bs)) {
-        char password[256];
-        printf("Disk image '%s' is encrypted.\n", name);
-        if (qemu_read_password(password, sizeof(password)) < 0) {
-            error_report("No password given");
-            goto error;
-        }
-        if (bdrv_set_key(bs, password) < 0) {
-            error_report("invalid password");
-            goto error;
-        }
-    }
-

     blk_set_enable_write_cache(qemuio_blk, !writethrough);
 
     return 0;
     blk_set_enable_write_cache(qemuio_blk, !writethrough);
 
     return 0;

-
- error:
-    blk_unref(qemuio_blk);
-    qemuio_blk = NULL;
-    return 1;

 }
 
 static void open_help(void)
 }
 
 static void open_help(void)


@@ -121,6 +127,7 @@ static void open_help(void)
 " Opens a file for subsequent use by all of the other qemu-io commands.\n"
 " -r, -- open file read-only\n"
 " -s, -- use snapshot file\n"
 " Opens a file for subsequent use by all of the other qemu-io commands.\n"
 " -r, -- open file read-only\n"
 " -s, -- use snapshot file\n"

+" -C, -- use copy-on-read\n"

 " -n, -- disable host cache, short for -t none\n"
 " -U, -- force shared permissions\n"
 " -k, -- use kernel AIO implementation (on Linux only)\n"
 " -n, -- disable host cache, short for -t none\n"
 " -U, -- force shared permissions\n"
 " -k, -- use kernel AIO implementation (on Linux only)\n"


@@ -139,7 +146,7 @@ static const cmdinfo_t open_cmd = {
     .argmin     = 1,
     .argmax     = -1,
     .flags      = CMD_NOFILE_OK,
     .argmin     = 1,
     .argmax     = -1,
     .flags      = CMD_NOFILE_OK,

-    .args       = "[-rsnkU] [-t cache] [-d discard] [-o options] [path]",
+    .args       = "[-rsCnkU] [-t cache] [-d discard] [-o options] [path]",

     .oneline    = "open the file specified by path",
     .help       = open_help,
 };
     .oneline    = "open the file specified by path",
     .help       = open_help,
 };


@@ -160,11 +167,12 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
     int readonly = 0;
     bool writethrough = true;
     int c;
     int readonly = 0;
     bool writethrough = true;
     int c;

+    int ret;

     QemuOpts *qopts;
     QDict *opts;
     bool force_share = false;
 
     QemuOpts *qopts;
     QDict *opts;
     bool force_share = false;
 

-    while ((c = getopt(argc, argv, "snro:kt:d:U")) != -1) {
+    while ((c = getopt(argc, argv, "snCro:kt:d:U")) != -1) {

         switch (c) {
         case 's':
             flags |= BDRV_O_SNAPSHOT;
         switch (c) {
         case 's':
             flags |= BDRV_O_SNAPSHOT;


@@ -173,6 +181,9 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
             flags |= BDRV_O_NOCACHE;
             writethrough = false;
             break;
             flags |= BDRV_O_NOCACHE;
             writethrough = false;
             break;

+        case 'C':
+            flags |= BDRV_O_COPY_ON_READ;
+            break;

         case 'r':
             readonly = 1;
             break;
         case 'r':
             readonly = 1;
             break;


@@ -183,25 +194,25 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
             if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
                 error_report("Invalid cache option: %s", optarg);
                 qemu_opts_reset(&empty_opts);
             if (bdrv_parse_cache_mode(optarg, &flags, &writethrough) < 0) {
                 error_report("Invalid cache option: %s", optarg);
                 qemu_opts_reset(&empty_opts);

-                return 0;
+                return -EINVAL;

             }
             break;
         case 'd':
             if (bdrv_parse_discard_flags(optarg, &flags) < 0) {
                 error_report("Invalid discard option: %s", optarg);
                 qemu_opts_reset(&empty_opts);
             }
             break;
         case 'd':
             if (bdrv_parse_discard_flags(optarg, &flags) < 0) {
                 error_report("Invalid discard option: %s", optarg);
                 qemu_opts_reset(&empty_opts);

-                return 0;
+                return -EINVAL;

             }
             break;
         case 'o':
             if (imageOpts) {
                 printf("--image-opts and 'open -o' are mutually exclusive\n");
                 qemu_opts_reset(&empty_opts);
             }
             break;
         case 'o':
             if (imageOpts) {
                 printf("--image-opts and 'open -o' are mutually exclusive\n");
                 qemu_opts_reset(&empty_opts);

-                return 0;
+                return -EINVAL;

             }
             if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) {
                 qemu_opts_reset(&empty_opts);
             }
             if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) {
                 qemu_opts_reset(&empty_opts);

-                return 0;
+                return -EINVAL;

             }
             break;
         case 'U':
             }
             break;
         case 'U':


@@ -209,7 +220,8 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
             break;
         default:
             qemu_opts_reset(&empty_opts);
             break;
         default:
             qemu_opts_reset(&empty_opts);

-            return qemuio_command_usage(&open_cmd);
+            qemuio_command_usage(&open_cmd);
+            return -EINVAL;

         }
     }
 
         }
     }
 


@@ -220,7 +232,7 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
     if (imageOpts && (optind == argc - 1)) {
         if (!qemu_opts_parse_noisily(&empty_opts, argv[optind], false)) {
             qemu_opts_reset(&empty_opts);
     if (imageOpts && (optind == argc - 1)) {
         if (!qemu_opts_parse_noisily(&empty_opts, argv[optind], false)) {
             qemu_opts_reset(&empty_opts);

-            return 0;
+            return -EINVAL;

         }
         optind++;
     }
         }
         optind++;
     }


@@ -230,18 +242,26 @@ static int open_f(BlockBackend *blk, int argc, char **argv)
     qemu_opts_reset(&empty_opts);
 
     if (optind == argc - 1) {
     qemu_opts_reset(&empty_opts);
 
     if (optind == argc - 1) {

-        return openfile(argv[optind], flags, writethrough, force_share, opts);
+        ret = openfile(argv[optind], flags, writethrough, force_share, opts);

     } else if (optind == argc) {
     } else if (optind == argc) {

-        return openfile(NULL, flags, writethrough, force_share, opts);
+        ret = openfile(NULL, flags, writethrough, force_share, opts);

     } else {
     } else {

-        QDECREF(opts);
-        return qemuio_command_usage(&open_cmd);
+        qobject_unref(opts);
+        qemuio_command_usage(&open_cmd);
+        return -EINVAL;
+    }
+
+    if (ret) {
+        return -EINVAL;

     }
     }

+
+    return 0;

 }
 
 static int quit_f(BlockBackend *blk, int argc, char **argv)
 {
 }
 
 static int quit_f(BlockBackend *blk, int argc, char **argv)
 {

-    return 1;
+    quit_qemu_io = true;
+    return 0;

 }
 
 static const cmdinfo_t quit_cmd = {
 }
 
 static const cmdinfo_t quit_cmd = {


@@ -269,6 +289,7 @@ static void usage(const char *name)
 "  -r, --read-only      export read-only\n"
 "  -s, --snapshot       use snapshot file\n"
 "  -n, --nocache        disable host cache, short for -t none\n"
 "  -r, --read-only      export read-only\n"
 "  -s, --snapshot       use snapshot file\n"
 "  -n, --nocache        disable host cache, short for -t none\n"

+"  -C, --copy-on-read   enable copy-on-read\n"

 "  -m, --misalign       misalign allocations for O_DIRECT\n"
 "  -k, --native-aio     use kernel AIO implementation (on Linux only)\n"
 "  -t, --cache=MODE     use the given cache mode for the image\n"
 "  -m, --misalign       misalign allocations for O_DIRECT\n"
 "  -k, --native-aio     use kernel AIO implementation (on Linux only)\n"
 "  -t, --cache=MODE     use the given cache mode for the image\n"


@@ -280,8 +301,9 @@ static void usage(const char *name)
 "  -h, --help           display this help and exit\n"
 "  -V, --version        output version information and exit\n"
 "\n"
 "  -h, --help           display this help and exit\n"
 "  -V, --version        output version information and exit\n"
 "\n"

-"See '%s -c help' for information on available commands."
-"\n",
+"See '%s -c help' for information on available commands.\n"
+"\n"
+QEMU_HELP_BOTTOM "\n",

     name, name);
 }
 
     name, name);
 }
 


@@ -334,7 +356,8 @@ static char *fetchline_readline(void)
     readline_start(readline_state, get_prompt(), 0, readline_func, &line);
     while (!line) {
         int ch = getchar();
     readline_start(readline_state, get_prompt(), 0, readline_func, &line);
     while (!line) {
         int ch = getchar();

-        if (ch == EOF) {
+        if (ttyEOF != 0x0 && ch == ttyEOF) {
+            printf("\n");

             break;
         }
         readline_handle_byte(readline_state, ch);
             break;
         }
         readline_handle_byte(readline_state, ch);


@@ -377,20 +400,24 @@ static void prep_fetchline(void *opaque)
     *fetchable= 1;
 }
 
     *fetchable= 1;
 }
 

-static void command_loop(void)
+static int command_loop(void)

 {
 {

-    int i, done = 0, fetchable = 0, prompted = 0;
+    int i, fetchable = 0, prompted = 0;
+    int ret, last_error = 0;

     char *input;
 
     char *input;
 

-    for (i = 0; !done && i < ncmdline; i++) {
-        done = qemuio_command(qemuio_blk, cmdline[i]);
+    for (i = 0; !quit_qemu_io && i < ncmdline; i++) {
+        ret = qemuio_command(qemuio_blk, cmdline[i]);
+        if (ret < 0) {
+            last_error = ret;
+        }

     }
     if (cmdline) {
         g_free(cmdline);
     }
     if (cmdline) {
         g_free(cmdline);

-        return;
+        return last_error;

     }
 
     }
 

-    while (!done) {
+    while (!quit_qemu_io) {

         if (!prompted) {
             printf("%s", get_prompt());
             fflush(stdout);
         if (!prompted) {
             printf("%s", get_prompt());
             fflush(stdout);


@@ -408,13 +435,19 @@ static void command_loop(void)
         if (input == NULL) {
             break;
         }
         if (input == NULL) {
             break;
         }

-        done = qemuio_command(qemuio_blk, input);
+        ret = qemuio_command(qemuio_blk, input);

         g_free(input);
 
         g_free(input);
 

+        if (ret < 0) {
+            last_error = ret;
+        }
+

         prompted = 0;
         fetchable = 0;
     }
     qemu_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL);
         prompted = 0;
         fetchable = 0;
     }
     qemu_set_fd_handler(STDIN_FILENO, NULL, NULL, NULL);

+
+    return last_error;

 }
 
 static void add_user_command(char *optarg)
 }
 
 static void add_user_command(char *optarg)


@@ -456,7 +489,7 @@ static QemuOptsList file_opts = {
 int main(int argc, char **argv)
 {
     int readonly = 0;
 int main(int argc, char **argv)
 {
     int readonly = 0;

-    const char *sopt = "hVc:d:f:rsnmkt:T:U";
+    const char *sopt = "hVc:d:f:rsnCmkt:T:U";

     const struct option lopt[] = {
         { "help", no_argument, NULL, 'h' },
         { "version", no_argument, NULL, 'V' },
     const struct option lopt[] = {
         { "help", no_argument, NULL, 'h' },
         { "version", no_argument, NULL, 'V' },


@@ -465,6 +498,7 @@ int main(int argc, char **argv)
         { "read-only", no_argument, NULL, 'r' },
         { "snapshot", no_argument, NULL, 's' },
         { "nocache", no_argument, NULL, 'n' },
         { "read-only", no_argument, NULL, 'r' },
         { "snapshot", no_argument, NULL, 's' },
         { "nocache", no_argument, NULL, 'n' },

+        { "copy-on-read", no_argument, NULL, 'C' },

         { "misalign", no_argument, NULL, 'm' },
         { "native-aio", no_argument, NULL, 'k' },
         { "discard", required_argument, NULL, 'd' },
         { "misalign", no_argument, NULL, 'm' },
         { "native-aio", no_argument, NULL, 'k' },
         { "discard", required_argument, NULL, 'd' },


@@ -478,6 +512,7 @@ int main(int argc, char **argv)
     int c;
     int opt_index = 0;
     int flags = BDRV_O_UNMAP;
     int c;
     int opt_index = 0;
     int flags = BDRV_O_UNMAP;

+    int ret;

     bool writethrough = true;
     Error *local_error = NULL;
     QDict *opts = NULL;
     bool writethrough = true;
     Error *local_error = NULL;
     QDict *opts = NULL;


@@ -490,7 +525,7 @@ int main(int argc, char **argv)
 #endif
 
     module_call_init(MODULE_INIT_TRACE);
 #endif
 
     module_call_init(MODULE_INIT_TRACE);

-    progname = basename(argv[0]);
+    progname = g_path_get_basename(argv[0]);

     qemu_init_exec_dir(argv[0]);
 
     qcrypto_init(&error_fatal);
     qemu_init_exec_dir(argv[0]);
 
     qcrypto_init(&error_fatal);


@@ -509,6 +544,9 @@ int main(int argc, char **argv)
             flags |= BDRV_O_NOCACHE;
             writethrough = false;
             break;
             flags |= BDRV_O_NOCACHE;
             writethrough = false;
             break;

+        case 'C':
+            flags |= BDRV_O_COPY_ON_READ;
+            break;

         case 'd':
             if (bdrv_parse_discard_flags(optarg, &flags) < 0) {
                 error_report("Invalid discard option: %s", optarg);
         case 'd':
             if (bdrv_parse_discard_flags(optarg, &flags) < 0) {
                 error_report("Invalid discard option: %s", optarg);


@@ -541,7 +579,8 @@ int main(int argc, char **argv)
             trace_file = trace_opt_parse(optarg);
             break;
         case 'V':
             trace_file = trace_opt_parse(optarg);
             break;
         case 'V':

-            printf("%s version %s\n", progname, QEMU_VERSION);
+            printf("%s version " QEMU_FULL_VERSION "\n"
+                   QEMU_COPYRIGHT "\n", progname);

             exit(0);
         case 'h':
             usage(progname);
             exit(0);
         case 'h':
             usage(progname);


@@ -599,6 +638,7 @@ int main(int argc, char **argv)
     qemuio_add_command(&close_cmd);
 
     if (isatty(STDIN_FILENO)) {
     qemuio_add_command(&close_cmd);
 
     if (isatty(STDIN_FILENO)) {

+        ttyEOF = get_eof_char();

         readline_state = readline_init(readline_printf_func,
                                        readline_flush_func,
                                        NULL,
         readline_state = readline_init(readline_printf_func,
                                        readline_flush_func,
                                        NULL,


@@ -634,7 +674,7 @@ int main(int argc, char **argv)
             }
         }
     }
             }
         }
     }

-    command_loop();
+    ret = command_loop();

 
     /*
      * Make sure all outstanding requests complete before the program exits.
 
     /*
      * Make sure all outstanding requests complete before the program exits.


@@ -643,5 +683,10 @@ int main(int argc, char **argv)
 
     blk_unref(qemuio_blk);
     g_free(readline_state);
 
     blk_unref(qemuio_blk);
     g_free(readline_state);

-    return 0;
+
+    if (ret < 0) {
+        return 1;
+    } else {
+        return 0;
+    }

 }
 }