tcg/README: fix description of bswap32_i32/i64

[qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index d03de4f1d5612f3fa437e8051d3ecaaddfe9a506..c6fe968ff2812733abd0f9a7e027febcbb3d5cf2 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */

+#include <dirent.h>

 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/pcmcia.h"
 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/pcmcia.h"


@@ -37,10 +38,10 @@
 #include "audio/audio.h"
 #include "disas.h"
 #include "balloon.h"
 #include "audio/audio.h"
 #include "disas.h"
 #include "balloon.h"

-#include <dirent.h>

 #include "qemu-timer.h"
 #include "migration.h"
 #include "kvm.h"
 #include "qemu-timer.h"
 #include "migration.h"
 #include "kvm.h"

+#include "acl.h"

 
 //#define DEBUG
 //#define DEBUG_COMPLETION
 
 //#define DEBUG
 //#define DEBUG_COMPLETION


@@ -97,11 +98,17 @@ static void monitor_read_command(Monitor *mon, int show_prompt)
         readline_show_prompt(mon->rs);
 }
 
         readline_show_prompt(mon->rs);
 }
 

-static void monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
-                                  void *opaque)
+static int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
+                                 void *opaque)

 {
 {

-    readline_start(mon->rs, "Password: ", 1, readline_func, opaque);
-    /* prompt is printed on return from the command handler */
+    if (mon->rs) {
+        readline_start(mon->rs, "Password: ", 1, readline_func, opaque);
+        /* prompt is printed on return from the command handler */
+        return 0;
+    } else {
+        monitor_printf(mon, "terminal does not support password prompting\n");
+        return -ENOTTY;
+    }

 }
 
 void monitor_flush(Monitor *mon)
 }
 
 void monitor_flush(Monitor *mon)


@@ -153,25 +160,25 @@ void monitor_print_filename(Monitor *mon, const char *filename)
     int i;
 
     for (i = 0; filename[i]; i++) {
     int i;
 
     for (i = 0; filename[i]; i++) {

-       switch (filename[i]) {
-       case ' ':
-       case '"':
-       case '\\':
-           monitor_printf(mon, "\\%c", filename[i]);
-           break;
-       case '\t':
-           monitor_printf(mon, "\\t");
-           break;
-       case '\r':
-           monitor_printf(mon, "\\r");
-           break;
-       case '\n':
-           monitor_printf(mon, "\\n");
-           break;
-       default:
-           monitor_printf(mon, "%c", filename[i]);
-           break;
-       }
+        switch (filename[i]) {
+        case ' ':
+        case '"':
+        case '\\':
+            monitor_printf(mon, "\\%c", filename[i]);
+            break;
+        case '\t':
+            monitor_printf(mon, "\\t");
+            break;
+        case '\r':
+            monitor_printf(mon, "\\r");
+            break;
+        case '\n':
+            monitor_printf(mon, "\\n");
+            break;
+        default:
+            monitor_printf(mon, "%c", filename[i]);
+            break;
+        }

     }
 }
 
     }
 }
 


@@ -311,6 +318,7 @@ static CPUState *mon_get_cpu(void)
     if (!cur_mon->mon_cpu) {
         mon_set_cpu(0);
     }
     if (!cur_mon->mon_cpu) {
         mon_set_cpu(0);
     }

+    cpu_synchronize_state(cur_mon->mon_cpu, 0);

     return cur_mon->mon_cpu;
 }
 
     return cur_mon->mon_cpu;
 }
 


@@ -337,6 +345,7 @@ static void do_info_cpus(Monitor *mon)
     mon_get_cpu();
 
     for(env = first_cpu; env != NULL; env = env->next_cpu) {
     mon_get_cpu();
 
     for(env = first_cpu; env != NULL; env = env->next_cpu) {

+        cpu_synchronize_state(env, 0);

         monitor_printf(mon, "%c CPU #%d:",
                        (env == mon->mon_cpu) ? '*' : ' ',
                        env->cpu_index);
         monitor_printf(mon, "%c CPU #%d:",
                        (env == mon->mon_cpu) ? '*' : ' ',
                        env->cpu_index);


@@ -373,6 +382,8 @@ static void do_info_history(Monitor *mon)
     int i;
     const char *str;
 
     int i;
     const char *str;
 

+    if (!mon->rs)
+        return;

     i = 0;
     for(;;) {
         str = readline_get_history(mon->rs, i);
     i = 0;
     for(;;) {
         str = readline_get_history(mon->rs, i);


@@ -465,17 +476,17 @@ static void change_vnc_password_cb(Monitor *mon, const char *password,
 static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
 {
     if (strcmp(target, "passwd") == 0 ||
 static void do_change_vnc(Monitor *mon, const char *target, const char *arg)
 {
     if (strcmp(target, "passwd") == 0 ||

-       strcmp(target, "password") == 0) {
-       if (arg) {
+        strcmp(target, "password") == 0) {
+        if (arg) {

             char password[9];
             char password[9];

-           strncpy(password, arg, sizeof(password));
-           password[sizeof(password) - 1] = '\0';
+            strncpy(password, arg, sizeof(password));
+            password[sizeof(password) - 1] = '\0';

             change_vnc_password_cb(mon, password, NULL);
         } else {
             monitor_read_password(mon, change_vnc_password_cb, NULL);
         }
     } else {
             change_vnc_password_cb(mon, password, NULL);
         } else {
             monitor_read_password(mon, change_vnc_password_cb, NULL);
         }
     } else {

-       if (vnc_display_open(NULL, target) < 0)
+        if (vnc_display_open(NULL, target) < 0)

             monitor_printf(mon, "could not start VNC server on %s\n", target);
     }
 }
             monitor_printf(mon, "could not start VNC server on %s\n", target);
     }
 }


@@ -484,9 +495,9 @@ static void do_change(Monitor *mon, const char *device, const char *target,
                       const char *arg)
 {
     if (strcmp(device, "vnc") == 0) {
                       const char *arg)
 {
     if (strcmp(device, "vnc") == 0) {

-       do_change_vnc(mon, target, arg);
+        do_change_vnc(mon, target, arg);

     } else {
     } else {

-       do_change_block(mon, device, target, arg);
+        do_change_block(mon, device, target, arg);

     }
 }
 
     }
 }
 


@@ -566,6 +577,8 @@ static void do_gdbserver(Monitor *mon, const char *port)
     if (gdbserver_start(port) < 0) {
         monitor_printf(mon, "Could not open gdbserver socket on port '%s'\n",
                        port);
     if (gdbserver_start(port) < 0) {
         monitor_printf(mon, "Could not open gdbserver socket on port '%s'\n",
                        port);

+    } else if (strcmp(port, "none") == 0) {
+        monitor_printf(mon, "Disabled gdbserver\n");

     } else {
         monitor_printf(mon, "Waiting gdb connection on port '%s'\n", port);
     }
     } else {
         monitor_printf(mon, "Waiting gdb connection on port '%s'\n", port);
     }


@@ -1524,6 +1537,86 @@ static void do_info_balloon(Monitor *mon)
         monitor_printf(mon, "balloon: actual=%d\n", (int)(actual >> 20));
 }
 
         monitor_printf(mon, "balloon: actual=%d\n", (int)(actual >> 20));
 }
 

+static void do_acl(Monitor *mon,
+                   const char *command,
+                   const char *aclname,
+                   const char *match,
+                   int has_index,
+                   int index)
+{
+    qemu_acl *acl;
+
+    acl = qemu_acl_find(aclname);
+    if (!acl) {
+        monitor_printf(mon, "acl: unknown list '%s'\n", aclname);
+        return;
+    }
+
+    if (strcmp(command, "show") == 0) {
+        int i = 0;
+        qemu_acl_entry *entry;
+        monitor_printf(mon, "policy: %s\n",
+                       acl->defaultDeny ? "deny" : "allow");
+        TAILQ_FOREACH(entry, &acl->entries, next) {
+            i++;
+            monitor_printf(mon, "%d: %s %s\n", i,
+                           entry->deny ? "deny" : "allow",
+                           entry->match);
+        }
+    } else if (strcmp(command, "reset") == 0) {
+        qemu_acl_reset(acl);
+        monitor_printf(mon, "acl: removed all rules\n");
+    } else if (strcmp(command, "policy") == 0) {
+        if (!match) {
+            monitor_printf(mon, "acl: missing policy parameter\n");
+            return;
+        }
+
+        if (strcmp(match, "allow") == 0) {
+            acl->defaultDeny = 0;
+            monitor_printf(mon, "acl: policy set to 'allow'\n");
+        } else if (strcmp(match, "deny") == 0) {
+            acl->defaultDeny = 1;
+            monitor_printf(mon, "acl: policy set to 'deny'\n");
+        } else {
+            monitor_printf(mon, "acl: unknown policy '%s', expected 'deny' or 'allow'\n", match);
+        }
+    } else if ((strcmp(command, "allow") == 0) ||
+               (strcmp(command, "deny") == 0)) {
+        int deny = strcmp(command, "deny") == 0 ? 1 : 0;
+        int ret;
+
+        if (!match) {
+            monitor_printf(mon, "acl: missing match parameter\n");
+            return;
+        }
+
+        if (has_index)
+            ret = qemu_acl_insert(acl, deny, match, index);
+        else
+            ret = qemu_acl_append(acl, deny, match);
+        if (ret < 0)
+            monitor_printf(mon, "acl: unable to add acl entry\n");
+        else
+            monitor_printf(mon, "acl: added rule at position %d\n", ret);
+    } else if (strcmp(command, "remove") == 0) {
+        int ret;
+
+        if (!match) {
+            monitor_printf(mon, "acl: missing match parameter\n");
+            return;
+        }
+
+        ret = qemu_acl_remove(acl, match);
+        if (ret < 0)
+            monitor_printf(mon, "acl: no matching acl entry\n");
+        else
+            monitor_printf(mon, "acl: removed rule at position %d\n", ret);
+    } else {
+        monitor_printf(mon, "acl: unknown command '%s'\n", command);
+    }
+}
+

 /* Please update qemu-doc.texi when adding or changing commands */
 static const mon_cmd_t mon_cmds[] = {
     { "help|?", "s?", help_cmd,
 /* Please update qemu-doc.texi when adding or changing commands */
 static const mon_cmd_t mon_cmds[] = {
     { "help|?", "s?", help_cmd,


@@ -1628,6 +1721,12 @@ static const mon_cmd_t mon_cmds[] = {
       "target", "request VM to change it's memory allocation (in MB)" },
     { "set_link", "ss", do_set_link,
       "name [up|down]", "change the link status of a network adapter" },
       "target", "request VM to change it's memory allocation (in MB)" },
     { "set_link", "ss", do_set_link,
       "name [up|down]", "change the link status of a network adapter" },

+    { "acl", "sss?i?", do_acl, "<command> <aclname> [<match>] [<index>]\n",
+                               "acl show vnc.username\n"
+                               "acl policy vnc.username deny\n"
+                               "acl allow vnc.username fred\n"
+                               "acl deny vnc.username bob\n"
+                               "acl reset vnc.username\n" },

     { NULL, NULL, },
 };
 
     { NULL, NULL, },
 };
 


@@ -1744,7 +1843,7 @@ static target_long monitor_get_ccr (const struct MonitorDef *md, int val)
 
     u = 0;
     for (i = 0; i < 8; i++)
 
     u = 0;
     for (i = 0; i < 8; i++)

-       u |= env->crf[i] << (32 - (4 * i));
+        u |= env->crf[i] << (32 - (4 * i));

 
     return u;
 }
 
     return u;
 }


@@ -2862,6 +2961,9 @@ static void monitor_find_completion(const char *cmdline)
                     cmd_completion(str, cmd->name);
                 }
             } else if (!strcmp(cmd->name, "sendkey")) {
                     cmd_completion(str, cmd->name);
                 }
             } else if (!strcmp(cmd->name, "sendkey")) {

+                char *sep = strrchr(str, '-');
+                if (sep)
+                    str = sep + 1;

                 readline_set_completion_index(cur_mon->rs, strlen(str));
                 for(key = key_defs; key->name != NULL; key++) {
                     cmd_completion(str, key->name);
                 readline_set_completion_index(cur_mon->rs, strlen(str));
                 for(key = key_defs; key->name != NULL; key++) {
                     cmd_completion(str, key->name);


@@ -2890,8 +2992,15 @@ static void monitor_read(void *opaque, const uint8_t *buf, int size)
 
     cur_mon = opaque;
 
 
     cur_mon = opaque;
 

-    for (i = 0; i < size; i++)
-        readline_handle_byte(cur_mon->rs, buf[i]);
+    if (cur_mon->rs) {
+        for (i = 0; i < size; i++)
+            readline_handle_byte(cur_mon->rs, buf[i]);
+    } else {
+        if (size == 0 || buf[size - 1] != 0)
+            monitor_printf(cur_mon, "corrupted command\n");
+        else
+            monitor_handle_command(cur_mon, (char *)buf);
+    }

 
     cur_mon = old_mon;
 }
 
     cur_mon = old_mon;
 }


@@ -2903,13 +3012,18 @@ static void monitor_command_cb(Monitor *mon, const char *cmdline, void *opaque)
     monitor_resume(mon);
 }
 
     monitor_resume(mon);
 }
 

-void monitor_suspend(Monitor *mon)
+int monitor_suspend(Monitor *mon)

 {
 {

+    if (!mon->rs)
+        return -ENOTTY;

     mon->suspend_cnt++;
     mon->suspend_cnt++;

+    return 0;

 }
 
 void monitor_resume(Monitor *mon)
 {
 }
 
 void monitor_resume(Monitor *mon)
 {

+    if (!mon->rs)
+        return;

     if (--mon->suspend_cnt == 0)
         readline_show_prompt(mon->rs);
 }
     if (--mon->suspend_cnt == 0)
         readline_show_prompt(mon->rs);
 }


@@ -2941,6 +3055,15 @@ static void monitor_event(void *opaque, int event)
     }
 }
 
     }
 }
 

+
+/*
+ * Local variables:
+ *  c-indent-level: 4
+ *  c-basic-offset: 4
+ *  tab-width: 8
+ * End:
+ */
+

 void monitor_init(CharDriverState *chr, int flags)
 {
     static int is_first_init = 1;
 void monitor_init(CharDriverState *chr, int flags)
 {
     static int is_first_init = 1;


@@ -2957,8 +3080,10 @@ void monitor_init(CharDriverState *chr, int flags)
     mon->flags = flags;
     if (mon->chr->focus != 0)
         mon->suspend_cnt = 1; /* mux'ed monitors start suspended */
     mon->flags = flags;
     if (mon->chr->focus != 0)
         mon->suspend_cnt = 1; /* mux'ed monitors start suspended */

-    mon->rs = readline_init(mon, monitor_find_completion);
-    monitor_read_command(mon, 0);
+    if (flags & MONITOR_USE_READLINE) {
+        mon->rs = readline_init(mon, monitor_find_completion);
+        monitor_read_command(mon, 0);
+    }

 
     qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, monitor_event,
                           mon);
 
     qemu_chr_add_handlers(chr, monitor_can_read, monitor_read, monitor_event,
                           mon);


@@ -2987,6 +3112,8 @@ void monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
                                  BlockDriverCompletionFunc *completion_cb,
                                  void *opaque)
 {
                                  BlockDriverCompletionFunc *completion_cb,
                                  void *opaque)
 {

+    int err;
+

     if (!bdrv_key_required(bs)) {
         if (completion_cb)
             completion_cb(opaque, 0);
     if (!bdrv_key_required(bs)) {
         if (completion_cb)
             completion_cb(opaque, 0);


@@ -2999,5 +3126,8 @@ void monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
     mon->password_completion_cb = completion_cb;
     mon->password_opaque = opaque;
 
     mon->password_completion_cb = completion_cb;
     mon->password_opaque = opaque;
 

-    monitor_read_password(mon, bdrv_password_cb, bs);
+    err = monitor_read_password(mon, bdrv_password_cb, bs);
+
+    if (err && completion_cb)
+        completion_cb(opaque, err);

 }
 }