kvm: Introduce --single-step command line option

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

diff --git a/tools/kvm/main.c b/tools/kvm/main.c
index 950e7010edf9fe1e9fbb4675b077b1b434ed37d0..184617c5cfa9eadf76e5596848294ffeb15fb82c 100644 (file)
--- a/tools/kvm/main.c
+++ b/tools/kvm/main.c
@@ -10,7 +10,7 @@
 
 static void usage(char *argv[])
 {
-       fprintf(stderr, "  usage: %s [--kernel=]<kernel-image>\n",
+       fprintf(stderr, "  usage: %s [--single-step] [--kernel=]<kernel-image>\n",
                argv[0]);
        exit(1);
 }
@@ -19,6 +19,7 @@ int main(int argc, char *argv[])
 {
        const char *kernel_filename = NULL;
        const char *kernel_cmdline = NULL;
+       bool single_step = false;
        struct kvm *kvm;
        int i;
 
@@ -29,6 +30,9 @@ int main(int argc, char *argv[])
                } else if (!strncmp("--params=", argv[i], 9)) {
                        kernel_cmdline = &argv[i][9];
                        continue;
+               } else if (!strncmp("--single-step", argv[i], 13)) {
+                       single_step = true;
+                       continue;
                } else {
                        /* any unspecified arg is kernel image */
                        if (argv[i][0] != '-')
@@ -49,7 +53,8 @@ int main(int argc, char *argv[])
 
        kvm__reset_vcpu(kvm);
 
-       kvm__enable_singlestep(kvm);
+       if (single_step)
+               kvm__enable_singlestep(kvm);
 
        for (;;) {
                kvm__run(kvm);