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 2c00ea068ece9fcaddea66edc906abf1531ae158..13829f5e21ba84e5cce5c39d2228377456eeb9db 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -37,6 +37,7 @@
 static char *progname;
 
 static BlockBackend *qemuio_blk;
 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;


@@ -86,7 +87,7 @@ static int openfile(char *name, int flags, bool writethrough, bool force_share,
 
     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;
     }
 


@@ -95,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_bool(opts, BDRV_OPT_FORCE_SHARE, 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) {


@@ -166,6 +167,7 @@ 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;


@@ -192,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':


@@ -218,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;

         }
     }
 
         }
     }
 


@@ -229,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++;
     }


@@ -239,19 +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) {

-        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) {

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

     } else {
     } else {

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

         qemuio_command_usage(&open_cmd);
         qemuio_command_usage(&open_cmd);

+        return -EINVAL;

     }
     }

+
+    if (ret) {
+        return -EINVAL;
+    }
+

     return 0;
 }
 
 static int quit_f(BlockBackend *blk, int argc, char **argv)
 {
     return 0;
 }
 
 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 = {


@@ -390,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);


@@ -421,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)


@@ -492,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;


@@ -504,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);


@@ -558,7 +579,7 @@ 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 " QEMU_VERSION QEMU_PKGVERSION "\n"
+            printf("%s version " QEMU_FULL_VERSION "\n"

                    QEMU_COPYRIGHT "\n", progname);
             exit(0);
         case 'h':
                    QEMU_COPYRIGHT "\n", progname);
             exit(0);
         case 'h':


@@ -653,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.


@@ -662,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;
+    }

 }
 }