trace: add "-trace enable=..."

[qemu.git] / qemu-io.c

diff --git a/qemu-io.c b/qemu-io.c
index 2d119c28a61aaeffbb860aa1ff06829198ca44e7..83c48f4149ddd686c2583f6dc8de70d892f42512 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -7,18 +7,18 @@
  * 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 <sys/time.h>
-#include <sys/types.h>
-#include <stdarg.h>
-#include <stdio.h>
+#include "qemu/osdep.h"

 #include <getopt.h>
 #include <libgen.h>
 
 #include "qemu-io.h"
 #include <getopt.h>
 #include <libgen.h>
 
 #include "qemu-io.h"

+#include "qemu/error-report.h"

 #include "qemu/main-loop.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/readline.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/readline.h"

+#include "qapi/qmp/qstring.h"
+#include "sysemu/block-backend.h"

 #include "block/block_int.h"
 #include "trace/control.h"
 
 #include "block/block_int.h"
 #include "trace/control.h"
 


@@ -26,7 +26,7 @@
 
 static char *progname;
 
 
 static char *progname;
 

-static BlockDriverState *qemuio_bs;
+static BlockBackend *qemuio_blk;

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


@@ -34,10 +34,10 @@ static char **cmdline;
 
 static ReadLineState *readline_state;
 
 
 static ReadLineState *readline_state;
 

-static int close_f(BlockDriverState *bs, int argc, char **argv)
+static int close_f(BlockBackend *blk, int argc, char **argv)

 {
 {

-    bdrv_unref(bs);
-    qemuio_bs = NULL;
+    blk_unref(qemuio_blk);
+    qemuio_blk = NULL;

     return 0;
 }
 
     return 0;
 }
 


@@ -48,40 +48,45 @@ static const cmdinfo_t close_cmd = {
     .oneline    = "close the current open file",
 };
 
     .oneline    = "close the current open file",
 };
 

-static int openfile(char *name, int flags, int growable, QDict *opts)
+static int openfile(char *name, int flags, QDict *opts)

 {
     Error *local_err = NULL;
 {
     Error *local_err = NULL;

+    BlockDriverState *bs;

 
 

-    if (qemuio_bs) {
-        fprintf(stderr, "file open already, try 'help close'\n");
+    if (qemuio_blk) {
+        error_report("file open already, try 'help close'");
+        QDECREF(opts);

         return 1;
     }
 
         return 1;
     }
 

-    if (growable) {
-        if (bdrv_open(&qemuio_bs, name, NULL, opts, flags | BDRV_O_PROTOCOL,
-                      NULL, &local_err))
-        {
-            fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
-                    error_get_pretty(local_err));
-            error_free(local_err);
-            return 1;
+    qemuio_blk = blk_new_open("hda", name, NULL, opts, flags, &local_err);
+    if (!qemuio_blk) {
+        error_reportf_err(local_err, "can't open%s%s: ",
+                          name ? " device " : "", name ?: "");
+        return 1;
+    }
+
+    bs = blk_bs(qemuio_blk);
+    if (bdrv_is_encrypted(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;

         }
         }

-    } else {
-        qemuio_bs = bdrv_new("hda");
-
-        if (bdrv_open(&qemuio_bs, name, NULL, opts, flags, NULL, &local_err)
-            < 0)
-        {
-            fprintf(stderr, "%s: can't open device %s: %s\n", progname, name,
-                    error_get_pretty(local_err));
-            error_free(local_err);
-            bdrv_unref(qemuio_bs);
-            qemuio_bs = NULL;
-            return 1;
+        if (bdrv_set_key(bs, password) < 0) {
+            error_report("invalid password");
+            goto error;

         }
     }
 
         }
     }
 

+

     return 0;
     return 0;

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

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


@@ -97,12 +102,11 @@ static void open_help(void)
 " -r, -- open file read-only\n"
 " -s, -- use snapshot file\n"
 " -n, -- disable host cache\n"
 " -r, -- open file read-only\n"
 " -s, -- use snapshot file\n"
 " -n, -- disable host cache\n"

-" -g, -- allow file to grow (only applies to protocols)\n"

 " -o, -- options to be given to the block driver"
 "\n");
 }
 
 " -o, -- options to be given to the block driver"
 "\n");
 }
 

-static int open_f(BlockDriverState *bs, int argc, char **argv);
+static int open_f(BlockBackend *blk, int argc, char **argv);

 
 static const cmdinfo_t open_cmd = {
     .name       = "open",
 
 static const cmdinfo_t open_cmd = {
     .name       = "open",


@@ -118,6 +122,7 @@ static const cmdinfo_t open_cmd = {
 
 static QemuOptsList empty_opts = {
     .name = "drive",
 
 static QemuOptsList empty_opts = {
     .name = "drive",

+    .merge_lists = true,

     .head = QTAILQ_HEAD_INITIALIZER(empty_opts.head),
     .desc = {
         /* no elements => accept any params */
     .head = QTAILQ_HEAD_INITIALIZER(empty_opts.head),
     .desc = {
         /* no elements => accept any params */


@@ -125,16 +130,15 @@ static QemuOptsList empty_opts = {
     },
 };
 
     },
 };
 

-static int open_f(BlockDriverState *bs, int argc, char **argv)
+static int open_f(BlockBackend *blk, int argc, char **argv)

 {
     int flags = 0;
     int readonly = 0;
 {
     int flags = 0;
     int readonly = 0;

-    int growable = 0;

     int c;
     QemuOpts *qopts;
     int c;
     QemuOpts *qopts;

-    QDict *opts = NULL;
+    QDict *opts;

 
 

-    while ((c = getopt(argc, argv, "snrgo:")) != EOF) {
+    while ((c = getopt(argc, argv, "snrgo:")) != -1) {

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


@@ -145,19 +149,14 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
         case 'r':
             readonly = 1;
             break;
         case 'r':
             readonly = 1;
             break;

-        case 'g':
-            growable = 1;
-            break;

         case 'o':
         case 'o':

-            qopts = qemu_opts_parse(&empty_opts, optarg, 0);
-            if (qopts == NULL) {
-                printf("could not parse option list -- %s\n", optarg);
+            if (!qemu_opts_parse_noisily(&empty_opts, optarg, false)) {
+                qemu_opts_reset(&empty_opts);

                 return 0;
             }
                 return 0;
             }

-            opts = qemu_opts_to_qdict(qopts, opts);
-            qemu_opts_del(qopts);

             break;
         default:
             break;
         default:

+            qemu_opts_reset(&empty_opts);

             return qemuio_command_usage(&open_cmd);
         }
     }
             return qemuio_command_usage(&open_cmd);
         }
     }


@@ -166,16 +165,21 @@ static int open_f(BlockDriverState *bs, int argc, char **argv)
         flags |= BDRV_O_RDWR;
     }
 
         flags |= BDRV_O_RDWR;
     }
 

+    qopts = qemu_opts_find(&empty_opts, NULL);
+    opts = qopts ? qemu_opts_to_qdict(qopts, NULL) : NULL;
+    qemu_opts_reset(&empty_opts);
+

     if (optind == argc - 1) {
     if (optind == argc - 1) {

-        return openfile(argv[optind], flags, growable, opts);
+        return openfile(argv[optind], flags, opts);

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

-        return openfile(NULL, flags, growable, opts);
+        return openfile(NULL, flags, opts);

     } else {
     } else {

+        QDECREF(opts);

         return qemuio_command_usage(&open_cmd);
     }
 }
 
         return qemuio_command_usage(&open_cmd);
     }
 }
 

-static int quit_f(BlockDriverState *bs, int argc, char **argv)
+static int quit_f(BlockBackend *blk, int argc, char **argv)

 {
     return 1;
 }
 {
     return 1;
 }


@@ -193,22 +197,25 @@ static const cmdinfo_t quit_cmd = {
 static void usage(const char *name)
 {
     printf(
 static void usage(const char *name)
 {
     printf(

-"Usage: %s [-h] [-V] [-rsnm] [-c cmd] ... [file]\n"
+"Usage: %s [-h] [-V] [-rsnm] [-f FMT] [-c STRING] ... [file]\n"

 "QEMU Disk exerciser\n"
 "\n"
 "QEMU Disk exerciser\n"
 "\n"

-"  -c, --cmd            command to execute\n"
+"  -c, --cmd STRING     execute command with its arguments\n"
+"                       from the given string\n"
+"  -f, --format FMT     specifies the block driver to use\n"

 "  -r, --read-only      export read-only\n"
 "  -s, --snapshot       use snapshot file\n"
 "  -n, --nocache        disable host cache\n"
 "  -r, --read-only      export read-only\n"
 "  -s, --snapshot       use snapshot file\n"
 "  -n, --nocache        disable host cache\n"

-"  -g, --growable       allow file to grow (only applies to protocols)\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"
 "  -T, --trace FILE     enable trace events listed in the given file\n"
 "  -h, --help           display this help and exit\n"
 "  -V, --version        output version information and exit\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"
 "  -T, --trace FILE     enable trace events listed in the given file\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",
 "\n",

-    name);
+    name, name);

 }
 
 static char *get_prompt(void)
 }
 
 static char *get_prompt(void)


@@ -309,7 +316,7 @@ static void command_loop(void)
     char *input;
 
     for (i = 0; !done && i < ncmdline; i++) {
     char *input;
 
     for (i = 0; !done && i < ncmdline; i++) {

-        done = qemuio_command(qemuio_bs, cmdline[i]);
+        done = qemuio_command(qemuio_blk, cmdline[i]);

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


@@ -334,7 +341,7 @@ static void command_loop(void)
         if (input == NULL) {
             break;
         }
         if (input == NULL) {
             break;
         }

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

         g_free(input);
 
         prompted = 0;
         g_free(input);
 
         prompted = 0;


@@ -345,7 +352,7 @@ static void command_loop(void)
 
 static void add_user_command(char *optarg)
 {
 
 static void add_user_command(char *optarg)
 {

-    cmdline = g_realloc(cmdline, ++ncmdline * sizeof(char *));
+    cmdline = g_renew(char *, cmdline, ++ncmdline);

     cmdline[ncmdline-1] = optarg;
 }
 
     cmdline[ncmdline-1] = optarg;
 }
 


@@ -357,18 +364,17 @@ static void reenable_tty_echo(void)
 int main(int argc, char **argv)
 {
     int readonly = 0;
 int main(int argc, char **argv)
 {
     int readonly = 0;

-    int growable = 0;
-    const char *sopt = "hVc:d:rsnmgkt:T:";
+    const char *sopt = "hVc:d:f:rsnmgkt:T:";

     const struct option lopt[] = {
         { "help", 0, NULL, 'h' },
         { "version", 0, NULL, 'V' },
         { "offset", 1, NULL, 'o' },
         { "cmd", 1, NULL, 'c' },
     const struct option lopt[] = {
         { "help", 0, NULL, 'h' },
         { "version", 0, NULL, 'V' },
         { "offset", 1, NULL, 'o' },
         { "cmd", 1, NULL, 'c' },

+        { "format", 1, NULL, 'f' },

         { "read-only", 0, NULL, 'r' },
         { "snapshot", 0, NULL, 's' },
         { "nocache", 0, NULL, 'n' },
         { "misalign", 0, NULL, 'm' },
         { "read-only", 0, NULL, 'r' },
         { "snapshot", 0, NULL, 's' },
         { "nocache", 0, NULL, 'n' },
         { "misalign", 0, NULL, 'm' },

-        { "growable", 0, NULL, 'g' },

         { "native-aio", 0, NULL, 'k' },
         { "discard", 1, NULL, 'd' },
         { "cache", 1, NULL, 't' },
         { "native-aio", 0, NULL, 'k' },
         { "discard", 1, NULL, 'd' },
         { "cache", 1, NULL, 't' },


@@ -378,6 +384,8 @@ 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;

+    Error *local_error = NULL;
+    QDict *opts = NULL;

 
 #ifdef CONFIG_POSIX
     signal(SIGPIPE, SIG_IGN);
 
 #ifdef CONFIG_POSIX
     signal(SIGPIPE, SIG_IGN);


@@ -386,6 +394,8 @@ int main(int argc, char **argv)
     progname = basename(argv[0]);
     qemu_init_exec_dir(argv[0]);
 
     progname = basename(argv[0]);
     qemu_init_exec_dir(argv[0]);
 

+    bdrv_init();
+

     while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
         switch (c) {
         case 's':
     while ((c = getopt_long(argc, argv, sopt, lopt, &opt_index)) != -1) {
         switch (c) {
         case 's':


@@ -400,6 +410,12 @@ int main(int argc, char **argv)
                 exit(1);
             }
             break;
                 exit(1);
             }
             break;

+        case 'f':
+            if (!opts) {
+                opts = qdict_new();
+            }
+            qdict_put(opts, "driver", qstring_from_str(optarg));
+            break;

         case 'c':
             add_user_command(optarg);
             break;
         case 'c':
             add_user_command(optarg);
             break;


@@ -409,9 +425,6 @@ int main(int argc, char **argv)
         case 'm':
             qemuio_misalign = true;
             break;
         case 'm':
             qemuio_misalign = true;
             break;

-        case 'g':
-            growable = 1;
-            break;

         case 'k':
             flags |= BDRV_O_NATIVE_AIO;
             break;
         case 'k':
             flags |= BDRV_O_NATIVE_AIO;
             break;


@@ -422,7 +435,7 @@ int main(int argc, char **argv)
             }
             break;
         case 'T':
             }
             break;
         case 'T':

-            if (!trace_backend_init(optarg, NULL)) {
+            if (!trace_init_backends()) {

                 exit(1); /* error message will have been printed */
             }
             break;
                 exit(1); /* error message will have been printed */
             }
             break;


@@ -443,8 +456,10 @@ int main(int argc, char **argv)
         exit(1);
     }
 
         exit(1);
     }
 

-    qemu_init_main_loop();
-    bdrv_init();
+    if (qemu_init_main_loop(&local_error)) {
+        error_report_err(local_error);
+        exit(1);
+    }

 
     /* initialize commands */
     qemuio_add_command(&quit_cmd);
 
     /* initialize commands */
     qemuio_add_command(&quit_cmd);


@@ -466,7 +481,7 @@ int main(int argc, char **argv)
     }
 
     if ((argc - optind) == 1) {
     }
 
     if ((argc - optind) == 1) {

-        openfile(argv[optind], flags, growable, NULL);
+        openfile(argv[optind], flags, opts);

     }
     command_loop();
 
     }
     command_loop();
 


@@ -475,9 +490,7 @@ int main(int argc, char **argv)
      */
     bdrv_drain_all();
 
      */
     bdrv_drain_all();
 

-    if (qemuio_bs) {
-        bdrv_unref(qemuio_bs);
-    }
+    blk_unref(qemuio_blk);

     g_free(readline_state);
     return 0;
 }
     g_free(readline_state);
     return 0;
 }