Switch non-CPU callers from ld/st*_phys to address_space_ld/st*

[qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index 1808e419323d7ceb83884eb10154994e009cc50a..c7a4db6a41b11cbcc183084d245913ab215522e7 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -35,6 +35,7 @@
 #include "sysemu/char.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/char.h"
 #include "ui/qemu-spice.h"
 #include "sysemu/sysemu.h"

+#include "sysemu/numa.h"

 #include "monitor/monitor.h"
 #include "qemu/readline.h"
 #include "ui/console.h"
 #include "monitor/monitor.h"
 #include "qemu/readline.h"
 #include "ui/console.h"


@@ -72,8 +73,9 @@
 #include "block/qapi.h"
 #include "qapi/qmp-event.h"
 #include "qapi-event.h"
 #include "block/qapi.h"
 #include "qapi/qmp-event.h"
 #include "qapi-event.h"

+#include "sysemu/block-backend.h"

 
 

-/* for pic/irq_info */
+/* for hmp_info_irq/pic */

 #if defined(TARGET_SPARC)
 #include "hw/sparc/sun4m.h"
 #endif
 #if defined(TARGET_SPARC)
 #include "hw/sparc/sun4m.h"
 #endif


@@ -264,10 +266,7 @@ void monitor_read_command(Monitor *mon, int show_prompt)
 int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
                           void *opaque)
 {
 int monitor_read_password(Monitor *mon, ReadLineFunc *readline_func,
                           void *opaque)
 {

-    if (monitor_ctrl_mode(mon)) {
-        qerror_report(QERR_MISSING_PARAMETER, "password");
-        return -EINVAL;
-    } else if (mon->rs) {
+    if (mon->rs) {

         readline_start(mon->rs, "Password: ", 1, readline_func, opaque);
         /* prompt is printed on return from the command handler */
         return 0;
         readline_start(mon->rs, "Password: ", 1, readline_func, opaque);
         /* prompt is printed on return from the command handler */
         return 0;


@@ -881,7 +880,7 @@ static void do_help_cmd(Monitor *mon, const QDict *qdict)
     help_cmd(mon, qdict_get_try_str(qdict, "name"));
 }
 
     help_cmd(mon, qdict_get_try_str(qdict, "name"));
 }
 

-static void do_trace_event_set_state(Monitor *mon, const QDict *qdict)
+static void hmp_trace_event(Monitor *mon, const QDict *qdict)

 {
     const char *tp_name = qdict_get_str(qdict, "name");
     bool new_state = qdict_get_bool(qdict, "option");
 {
     const char *tp_name = qdict_get_str(qdict, "name");
     bool new_state = qdict_get_bool(qdict, "option");


@@ -889,13 +888,12 @@ static void do_trace_event_set_state(Monitor *mon, const QDict *qdict)
 
     qmp_trace_event_set_state(tp_name, new_state, true, true, &local_err);
     if (local_err) {
 
     qmp_trace_event_set_state(tp_name, new_state, true, true, &local_err);
     if (local_err) {

-        qerror_report_err(local_err);
-        error_free(local_err);
+        error_report_err(local_err);

     }
 }
 
 #ifdef CONFIG_TRACE_SIMPLE
     }
 }
 
 #ifdef CONFIG_TRACE_SIMPLE

-static void do_trace_file(Monitor *mon, const QDict *qdict)
+static void hmp_trace_file(Monitor *mon, const QDict *qdict)

 {
     const char *op = qdict_get_try_str(qdict, "op");
     const char *arg = qdict_get_try_str(qdict, "arg");
 {
     const char *op = qdict_get_try_str(qdict, "op");
     const char *arg = qdict_get_try_str(qdict, "arg");


@@ -958,7 +956,7 @@ static void user_async_cmd_handler(Monitor *mon, const mon_cmd_t *cmd,
     }
 }
 
     }
 }
 

-static void do_info_help(Monitor *mon, const QDict *qdict)
+static void hmp_info_help(Monitor *mon, const QDict *qdict)

 {
     help_cmd(mon, "info");
 }
 {
     help_cmd(mon, "info");
 }


@@ -1027,7 +1025,7 @@ int monitor_get_cpu_index(void)
     return cpu->cpu_index;
 }
 
     return cpu->cpu_index;
 }
 

-static void do_info_registers(Monitor *mon, const QDict *qdict)
+static void hmp_info_registers(Monitor *mon, const QDict *qdict)

 {
     CPUState *cpu;
     CPUArchState *env;
 {
     CPUState *cpu;
     CPUArchState *env;


@@ -1036,18 +1034,18 @@ static void do_info_registers(Monitor *mon, const QDict *qdict)
     cpu_dump_state(cpu, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU);
 }
 
     cpu_dump_state(cpu, (FILE *)mon, monitor_fprintf, CPU_DUMP_FPU);
 }
 

-static void do_info_jit(Monitor *mon, const QDict *qdict)
+static void hmp_info_jit(Monitor *mon, const QDict *qdict)

 {
     dump_exec_info((FILE *)mon, monitor_fprintf);
     dump_drift_info((FILE *)mon, monitor_fprintf);
 }
 
 {
     dump_exec_info((FILE *)mon, monitor_fprintf);
     dump_drift_info((FILE *)mon, monitor_fprintf);
 }
 

-static void do_info_opcount(Monitor *mon, const QDict *qdict)
+static void hmp_info_opcount(Monitor *mon, const QDict *qdict)

 {
     dump_opcount_info((FILE *)mon, monitor_fprintf);
 }
 
 {
     dump_opcount_info((FILE *)mon, monitor_fprintf);
 }
 

-static void do_info_history(Monitor *mon, const QDict *qdict)
+static void hmp_info_history(Monitor *mon, const QDict *qdict)

 {
     int i;
     const char *str;
 {
     int i;
     const char *str;


@@ -1064,7 +1062,7 @@ static void do_info_history(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_info_cpu_stats(Monitor *mon, const QDict *qdict)
+static void hmp_info_cpustats(Monitor *mon, const QDict *qdict)

 {
     CPUState *cpu;
     CPUArchState *env;
 {
     CPUState *cpu;
     CPUArchState *env;


@@ -1074,7 +1072,7 @@ static void do_info_cpu_stats(Monitor *mon, const QDict *qdict)
     cpu_dump_statistics(cpu, (FILE *)mon, &monitor_fprintf, 0);
 }
 
     cpu_dump_statistics(cpu, (FILE *)mon, &monitor_fprintf, 0);
 }
 

-static void do_trace_print_events(Monitor *mon, const QDict *qdict)
+static void hmp_info_trace_events(Monitor *mon, const QDict *qdict)

 {
     TraceEventInfoList *events = qmp_trace_event_get_state("*", NULL);
     TraceEventInfoList *elem;
 {
     TraceEventInfoList *events = qmp_trace_event_get_state("*", NULL);
     TraceEventInfoList *elem;


@@ -1095,11 +1093,13 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
     const char *subject  = qdict_get_try_str(qdict, "cert-subject");
     int port             = qdict_get_try_int(qdict, "port", -1);
     int tls_port         = qdict_get_try_int(qdict, "tls-port", -1);
     const char *subject  = qdict_get_try_str(qdict, "cert-subject");
     int port             = qdict_get_try_int(qdict, "port", -1);
     int tls_port         = qdict_get_try_int(qdict, "tls-port", -1);

+    Error *err = NULL;

     int ret;
 
     if (strcmp(protocol, "spice") == 0) {
     int ret;
 
     if (strcmp(protocol, "spice") == 0) {

-        if (!using_spice) {
-            qerror_report(QERR_DEVICE_NOT_ACTIVE, "spice");
+        if (!qemu_using_spice(&err)) {
+            qerror_report_err(err);
+            error_free(err);

             return -1;
         }
 
             return -1;
         }
 


@@ -1121,12 +1121,12 @@ static int client_migrate_info(Monitor *mon, const QDict *qdict,
     return -1;
 }
 
     return -1;
 }
 

-static void do_logfile(Monitor *mon, const QDict *qdict)
+static void hmp_logfile(Monitor *mon, const QDict *qdict)

 {
     qemu_set_log_filename(qdict_get_str(qdict, "filename"));
 }
 
 {
     qemu_set_log_filename(qdict_get_str(qdict, "filename"));
 }
 

-static void do_log(Monitor *mon, const QDict *qdict)
+static void hmp_log(Monitor *mon, const QDict *qdict)

 {
     int mask;
     const char *items = qdict_get_str(qdict, "items");
 {
     int mask;
     const char *items = qdict_get_str(qdict, "items");


@@ -1143,7 +1143,7 @@ static void do_log(Monitor *mon, const QDict *qdict)
     qemu_set_log(mask);
 }
 
     qemu_set_log(mask);
 }
 

-static void do_singlestep(Monitor *mon, const QDict *qdict)
+static void hmp_singlestep(Monitor *mon, const QDict *qdict)

 {
     const char *option = qdict_get_try_str(qdict, "option");
     if (!option || !strcmp(option, "on")) {
 {
     const char *option = qdict_get_try_str(qdict, "option");
     if (!option || !strcmp(option, "on")) {


@@ -1155,7 +1155,7 @@ static void do_singlestep(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_gdbserver(Monitor *mon, const QDict *qdict)
+static void hmp_gdbserver(Monitor *mon, const QDict *qdict)

 {
     const char *device = qdict_get_try_str(qdict, "device");
     if (!device)
 {
     const char *device = qdict_get_try_str(qdict, "device");
     if (!device)


@@ -1171,7 +1171,7 @@ static void do_gdbserver(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_watchdog_action(Monitor *mon, const QDict *qdict)
+static void hmp_watchdog_action(Monitor *mon, const QDict *qdict)

 {
     const char *action = qdict_get_str(qdict, "action");
     if (select_watchdog_action(action) == -1) {
 {
     const char *action = qdict_get_str(qdict, "action");
     if (select_watchdog_action(action) == -1) {


@@ -1292,16 +1292,16 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize,
             switch(wsize) {
             default:
             case 1:
             switch(wsize) {
             default:
             case 1:

-                v = ldub_raw(buf + i);
+                v = ldub_p(buf + i);

                 break;
             case 2:
                 break;
             case 2:

-                v = lduw_raw(buf + i);
+                v = lduw_p(buf + i);

                 break;
             case 4:
                 break;
             case 4:

-                v = (uint32_t)ldl_raw(buf + i);
+                v = (uint32_t)ldl_p(buf + i);

                 break;
             case 8:
                 break;
             case 8:

-                v = ldq_raw(buf + i);
+                v = ldq_p(buf + i);

                 break;
             }
             monitor_printf(mon, " ");
                 break;
             }
             monitor_printf(mon, " ");


@@ -1330,7 +1330,7 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize,
     }
 }
 
     }
 }
 

-static void do_memory_dump(Monitor *mon, const QDict *qdict)
+static void hmp_memory_dump(Monitor *mon, const QDict *qdict)

 {
     int count = qdict_get_int(qdict, "count");
     int format = qdict_get_int(qdict, "format");
 {
     int count = qdict_get_int(qdict, "count");
     int format = qdict_get_int(qdict, "format");


@@ -1340,7 +1340,7 @@ static void do_memory_dump(Monitor *mon, const QDict *qdict)
     memory_dump(mon, count, format, size, addr, 0);
 }
 
     memory_dump(mon, count, format, size, addr, 0);
 }
 

-static void do_physical_memory_dump(Monitor *mon, const QDict *qdict)
+static void hmp_physical_memory_dump(Monitor *mon, const QDict *qdict)

 {
     int count = qdict_get_int(qdict, "count");
     int format = qdict_get_int(qdict, "format");
 {
     int count = qdict_get_int(qdict, "count");
     int format = qdict_get_int(qdict, "format");


@@ -1376,7 +1376,7 @@ static void do_print(Monitor *mon, const QDict *qdict)
     monitor_printf(mon, "\n");
 }
 
     monitor_printf(mon, "\n");
 }
 

-static void do_sum(Monitor *mon, const QDict *qdict)
+static void hmp_sum(Monitor *mon, const QDict *qdict)

 {
     uint32_t addr;
     uint16_t sum;
 {
     uint32_t addr;
     uint16_t sum;


@@ -1385,7 +1385,8 @@ static void do_sum(Monitor *mon, const QDict *qdict)
 
     sum = 0;
     for(addr = start; addr < (start + size); addr++) {
 
     sum = 0;
     for(addr = start; addr < (start + size); addr++) {

-        uint8_t val = ldub_phys(&address_space_memory, addr);
+        uint8_t val = address_space_ldub(&address_space_memory, addr,
+                                         MEMTXATTRS_UNSPECIFIED, NULL);

         /* BSD sum algorithm ('sum' Unix command) */
         sum = (sum >> 1) | (sum << 15);
         sum += val;
         /* BSD sum algorithm ('sum' Unix command) */
         sum = (sum >> 1) | (sum << 15);
         sum += val;


@@ -1395,7 +1396,7 @@ static void do_sum(Monitor *mon, const QDict *qdict)
 
 static int mouse_button_state;
 
 
 static int mouse_button_state;
 

-static void do_mouse_move(Monitor *mon, const QDict *qdict)
+static void hmp_mouse_move(Monitor *mon, const QDict *qdict)

 {
     int dx, dy, dz, button;
     const char *dx_str = qdict_get_str(qdict, "dx_str");
 {
     int dx, dy, dz, button;
     const char *dx_str = qdict_get_str(qdict, "dx_str");


@@ -1419,7 +1420,7 @@ static void do_mouse_move(Monitor *mon, const QDict *qdict)
     qemu_input_event_sync();
 }
 
     qemu_input_event_sync();
 }
 

-static void do_mouse_button(Monitor *mon, const QDict *qdict)
+static void hmp_mouse_button(Monitor *mon, const QDict *qdict)

 {
     static uint32_t bmap[INPUT_BUTTON_MAX] = {
         [INPUT_BUTTON_LEFT]       = MOUSE_EVENT_LBUTTON,
 {
     static uint32_t bmap[INPUT_BUTTON_MAX] = {
         [INPUT_BUTTON_LEFT]       = MOUSE_EVENT_LBUTTON,


@@ -1436,7 +1437,7 @@ static void do_mouse_button(Monitor *mon, const QDict *qdict)
     mouse_button_state = button_state;
 }
 
     mouse_button_state = button_state;
 }
 

-static void do_ioport_read(Monitor *mon, const QDict *qdict)
+static void hmp_ioport_read(Monitor *mon, const QDict *qdict)

 {
     int size = qdict_get_int(qdict, "size");
     int addr = qdict_get_int(qdict, "addr");
 {
     int size = qdict_get_int(qdict, "size");
     int addr = qdict_get_int(qdict, "addr");


@@ -1470,7 +1471,7 @@ static void do_ioport_read(Monitor *mon, const QDict *qdict)
                    suffix, addr, size * 2, val);
 }
 
                    suffix, addr, size * 2, val);
 }
 

-static void do_ioport_write(Monitor *mon, const QDict *qdict)
+static void hmp_ioport_write(Monitor *mon, const QDict *qdict)

 {
     int size = qdict_get_int(qdict, "size");
     int addr = qdict_get_int(qdict, "addr");
 {
     int size = qdict_get_int(qdict, "size");
     int addr = qdict_get_int(qdict, "addr");


@@ -1492,7 +1493,7 @@ static void do_ioport_write(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_boot_set(Monitor *mon, const QDict *qdict)
+static void hmp_boot_set(Monitor *mon, const QDict *qdict)

 {
     Error *local_err = NULL;
     const char *bootdevice = qdict_get_str(qdict, "bootdevice");
 {
     Error *local_err = NULL;
     const char *bootdevice = qdict_get_str(qdict, "bootdevice");


@@ -1656,7 +1657,7 @@ static void tlb_info_64(Monitor *mon, CPUArchState *env)
 }
 #endif
 
 }
 #endif
 

-static void tlb_info(Monitor *mon, const QDict *qdict)
+static void hmp_info_tlb(Monitor *mon, const QDict *qdict)

 {
     CPUArchState *env;
 
 {
     CPUArchState *env;
 


@@ -1879,7 +1880,7 @@ static void mem_info_64(Monitor *mon, CPUArchState *env)
 }
 #endif
 
 }
 #endif
 

-static void mem_info(Monitor *mon, const QDict *qdict)
+static void hmp_info_mem(Monitor *mon, const QDict *qdict)

 {
     CPUArchState *env;
 
 {
     CPUArchState *env;
 


@@ -1918,7 +1919,7 @@ static void print_tlb(Monitor *mon, int idx, tlb_t *tlb)
                    tlb->d, tlb->wt);
 }
 
                    tlb->d, tlb->wt);
 }
 

-static void tlb_info(Monitor *mon, const QDict *qdict)
+static void hmp_info_tlb(Monitor *mon, const QDict *qdict)

 {
     CPUArchState *env = mon_get_cpu();
     int i;
 {
     CPUArchState *env = mon_get_cpu();
     int i;


@@ -1934,7 +1935,7 @@ static void tlb_info(Monitor *mon, const QDict *qdict)
 #endif
 
 #if defined(TARGET_SPARC) || defined(TARGET_PPC) || defined(TARGET_XTENSA)
 #endif
 
 #if defined(TARGET_SPARC) || defined(TARGET_PPC) || defined(TARGET_XTENSA)

-static void tlb_info(Monitor *mon, const QDict *qdict)
+static void hmp_info_tlb(Monitor *mon, const QDict *qdict)

 {
     CPUArchState *env1 = mon_get_cpu();
 
 {
     CPUArchState *env1 = mon_get_cpu();
 


@@ -1942,12 +1943,12 @@ static void tlb_info(Monitor *mon, const QDict *qdict)
 }
 #endif
 
 }
 #endif
 

-static void do_info_mtree(Monitor *mon, const QDict *qdict)
+static void hmp_info_mtree(Monitor *mon, const QDict *qdict)

 {
     mtree_info((fprintf_function)monitor_printf, mon);
 }
 
 {
     mtree_info((fprintf_function)monitor_printf, mon);
 }
 

-static void do_info_numa(Monitor *mon, const QDict *qdict)
+static void hmp_info_numa(Monitor *mon, const QDict *qdict)

 {
     int i;
     CPUState *cpu;
 {
     int i;
     CPUState *cpu;


@@ -1972,20 +1973,20 @@ static void do_info_numa(Monitor *mon, const QDict *qdict)
 
 #ifdef CONFIG_PROFILER
 
 
 #ifdef CONFIG_PROFILER
 

-int64_t qemu_time;
+int64_t tcg_time;

 int64_t dev_time;
 
 int64_t dev_time;
 

-static void do_info_profile(Monitor *mon, const QDict *qdict)
+static void hmp_info_profile(Monitor *mon, const QDict *qdict)

 {
     monitor_printf(mon, "async time  %" PRId64 " (%0.3f)\n",
                    dev_time, dev_time / (double)get_ticks_per_sec());
     monitor_printf(mon, "qemu time   %" PRId64 " (%0.3f)\n",
 {
     monitor_printf(mon, "async time  %" PRId64 " (%0.3f)\n",
                    dev_time, dev_time / (double)get_ticks_per_sec());
     monitor_printf(mon, "qemu time   %" PRId64 " (%0.3f)\n",

-                   qemu_time, qemu_time / (double)get_ticks_per_sec());
-    qemu_time = 0;
+                   tcg_time, tcg_time / (double)get_ticks_per_sec());
+    tcg_time = 0;

     dev_time = 0;
 }
 #else
     dev_time = 0;
 }
 #else

-static void do_info_profile(Monitor *mon, const QDict *qdict)
+static void hmp_info_profile(Monitor *mon, const QDict *qdict)

 {
     monitor_printf(mon, "Internal profiler not compiled\n");
 }
 {
     monitor_printf(mon, "Internal profiler not compiled\n");
 }


@@ -1994,7 +1995,7 @@ static void do_info_profile(Monitor *mon, const QDict *qdict)
 /* Capture support */
 static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
 
 /* Capture support */
 static QLIST_HEAD (capture_list_head, CaptureState) capture_head;
 

-static void do_info_capture(Monitor *mon, const QDict *qdict)
+static void hmp_info_capture(Monitor *mon, const QDict *qdict)

 {
     int i;
     CaptureState *s;
 {
     int i;
     CaptureState *s;


@@ -2005,7 +2006,7 @@ static void do_info_capture(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_stop_capture(Monitor *mon, const QDict *qdict)
+static void hmp_stopcapture(Monitor *mon, const QDict *qdict)

 {
     int i;
     int n = qdict_get_int(qdict, "n");
 {
     int i;
     int n = qdict_get_int(qdict, "n");


@@ -2021,7 +2022,7 @@ static void do_stop_capture(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_wav_capture(Monitor *mon, const QDict *qdict)
+static void hmp_wavcapture(Monitor *mon, const QDict *qdict)

 {
     const char *path = qdict_get_str(qdict, "path");
     int has_freq = qdict_haskey(qdict, "freq");
 {
     const char *path = qdict_get_str(qdict, "path");
     int has_freq = qdict_haskey(qdict, "freq");


@@ -2056,7 +2057,7 @@ static qemu_acl *find_acl(Monitor *mon, const char *name)
     return acl;
 }
 
     return acl;
 }
 

-static void do_acl_show(Monitor *mon, const QDict *qdict)
+static void hmp_acl_show(Monitor *mon, const QDict *qdict)

 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     qemu_acl *acl = find_acl(mon, aclname);
 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     qemu_acl *acl = find_acl(mon, aclname);


@@ -2074,7 +2075,7 @@ static void do_acl_show(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_acl_reset(Monitor *mon, const QDict *qdict)
+static void hmp_acl_reset(Monitor *mon, const QDict *qdict)

 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     qemu_acl *acl = find_acl(mon, aclname);
 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     qemu_acl *acl = find_acl(mon, aclname);


@@ -2085,7 +2086,7 @@ static void do_acl_reset(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_acl_policy(Monitor *mon, const QDict *qdict)
+static void hmp_acl_policy(Monitor *mon, const QDict *qdict)

 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *policy = qdict_get_str(qdict, "policy");
 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *policy = qdict_get_str(qdict, "policy");


@@ -2105,7 +2106,7 @@ static void do_acl_policy(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_acl_add(Monitor *mon, const QDict *qdict)
+static void hmp_acl_add(Monitor *mon, const QDict *qdict)

 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *match = qdict_get_str(qdict, "match");
 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *match = qdict_get_str(qdict, "match");


@@ -2136,7 +2137,7 @@ static void do_acl_add(Monitor *mon, const QDict *qdict)
     }
 }
 
     }
 }
 

-static void do_acl_remove(Monitor *mon, const QDict *qdict)
+static void hmp_acl_remove(Monitor *mon, const QDict *qdict)

 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *match = qdict_get_str(qdict, "match");
 {
     const char *aclname = qdict_get_str(qdict, "aclname");
     const char *match = qdict_get_str(qdict, "match");


@@ -2153,7 +2154,7 @@ static void do_acl_remove(Monitor *mon, const QDict *qdict)
 }
 
 #if defined(TARGET_I386)
 }
 
 #if defined(TARGET_I386)

-static void do_inject_mce(Monitor *mon, const QDict *qdict)
+static void hmp_mce(Monitor *mon, const QDict *qdict)

 {
     X86CPU *cpu;
     CPUState *cs;
 {
     X86CPU *cpu;
     CPUState *cs;


@@ -2231,7 +2232,7 @@ void qmp_closefd(const char *fdname, Error **errp)
     error_set(errp, QERR_FD_NOT_FOUND, fdname);
 }
 
     error_set(errp, QERR_FD_NOT_FOUND, fdname);
 }
 

-static void do_loadvm(Monitor *mon, const QDict *qdict)
+static void hmp_loadvm(Monitor *mon, const QDict *qdict)

 {
     int saved_vm_running  = runstate_is_running();
     const char *name = qdict_get_str(qdict, "name");
 {
     int saved_vm_running  = runstate_is_running();
     const char *name = qdict_get_str(qdict, "name");


@@ -2569,20 +2570,7 @@ void monitor_fdset_dup_fd_remove(int dup_fd)
     monitor_fdset_dup_fd_find_remove(dup_fd, true);
 }
 
     monitor_fdset_dup_fd_find_remove(dup_fd, true);
 }
 

-int monitor_handle_fd_param(Monitor *mon, const char *fdname)
-{
-    int fd;
-    Error *local_err = NULL;
-
-    fd = monitor_handle_fd_param2(mon, fdname, &local_err);
-    if (local_err) {
-        qerror_report_err(local_err);
-        error_free(local_err);
-    }
-    return fd;
-}
-
-int monitor_handle_fd_param2(Monitor *mon, const char *fdname, Error **errp)
+int monitor_fd_param(Monitor *mon, const char *fdname, Error **errp)

 {
     int fd;
     Error *local_err = NULL;
 {
     int fd;
     Error *local_err = NULL;


@@ -2620,7 +2608,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show the network state",
         .args_type  = "",
         .params     = "",
         .help       = "show the network state",

-        .mhandler.cmd = do_info_network,
+        .mhandler.cmd = hmp_info_network,

     },
     {
         .name       = "chardev",
     },
     {
         .name       = "chardev",


@@ -2656,7 +2644,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show the cpu registers",
         .args_type  = "",
         .params     = "",
         .help       = "show the cpu registers",

-        .mhandler.cmd = do_info_registers,
+        .mhandler.cmd = hmp_info_registers,

     },
     {
         .name       = "cpus",
     },
     {
         .name       = "cpus",


@@ -2670,7 +2658,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show the command line history",
         .args_type  = "",
         .params     = "",
         .help       = "show the command line history",

-        .mhandler.cmd = do_info_history,
+        .mhandler.cmd = hmp_info_history,

     },
 #if defined(TARGET_I386) || defined(TARGET_PPC) || defined(TARGET_MIPS) || \
     defined(TARGET_LM32) || (defined(TARGET_SPARC) && !defined(TARGET_SPARC64))
     },
 #if defined(TARGET_I386) || defined(TARGET_PPC) || defined(TARGET_MIPS) || \
     defined(TARGET_LM32) || (defined(TARGET_SPARC) && !defined(TARGET_SPARC64))


@@ -2680,11 +2668,11 @@ static mon_cmd_t info_cmds[] = {
         .params     = "",
         .help       = "show the interrupts statistics (if available)",
 #ifdef TARGET_SPARC
         .params     = "",
         .help       = "show the interrupts statistics (if available)",
 #ifdef TARGET_SPARC

-        .mhandler.cmd = sun4m_irq_info,
+        .mhandler.cmd = sun4m_hmp_info_irq,

 #elif defined(TARGET_LM32)
 #elif defined(TARGET_LM32)

-        .mhandler.cmd = lm32_irq_info,
+        .mhandler.cmd = lm32_hmp_info_irq,

 #else
 #else

-        .mhandler.cmd = irq_info,
+        .mhandler.cmd = hmp_info_irq,

 #endif
     },
     {
 #endif
     },
     {


@@ -2693,11 +2681,11 @@ static mon_cmd_t info_cmds[] = {
         .params     = "",
         .help       = "show i8259 (PIC) state",
 #ifdef TARGET_SPARC
         .params     = "",
         .help       = "show i8259 (PIC) state",
 #ifdef TARGET_SPARC

-        .mhandler.cmd = sun4m_pic_info,
+        .mhandler.cmd = sun4m_hmp_info_pic,

 #elif defined(TARGET_LM32)
 #elif defined(TARGET_LM32)

-        .mhandler.cmd = lm32_do_pic_info,
+        .mhandler.cmd = lm32_hmp_info_pic,

 #else
 #else

-        .mhandler.cmd = pic_info,
+        .mhandler.cmd = hmp_info_pic,

 #endif
     },
 #endif
 #endif
     },
 #endif


@@ -2715,7 +2703,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show virtual to physical memory mappings",
         .args_type  = "",
         .params     = "",
         .help       = "show virtual to physical memory mappings",

-        .mhandler.cmd = tlb_info,
+        .mhandler.cmd = hmp_info_tlb,

     },
 #endif
 #if defined(TARGET_I386)
     },
 #endif
 #if defined(TARGET_I386)


@@ -2724,7 +2712,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show the active virtual memory mappings",
         .args_type  = "",
         .params     = "",
         .help       = "show the active virtual memory mappings",

-        .mhandler.cmd = mem_info,
+        .mhandler.cmd = hmp_info_mem,

     },
 #endif
     {
     },
 #endif
     {


@@ -2732,21 +2720,21 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show memory tree",
         .args_type  = "",
         .params     = "",
         .help       = "show memory tree",

-        .mhandler.cmd = do_info_mtree,
+        .mhandler.cmd = hmp_info_mtree,

     },
     {
         .name       = "jit",
         .args_type  = "",
         .params     = "",
         .help       = "show dynamic compiler info",
     },
     {
         .name       = "jit",
         .args_type  = "",
         .params     = "",
         .help       = "show dynamic compiler info",

-        .mhandler.cmd = do_info_jit,
+        .mhandler.cmd = hmp_info_jit,

     },
     {
         .name       = "opcount",
         .args_type  = "",
         .params     = "",
         .help       = "show dynamic compiler opcode counters",
     },
     {
         .name       = "opcount",
         .args_type  = "",
         .params     = "",
         .help       = "show dynamic compiler opcode counters",

-        .mhandler.cmd = do_info_opcount,
+        .mhandler.cmd = hmp_info_opcount,

     },
     {
         .name       = "kvm",
     },
     {
         .name       = "kvm",


@@ -2760,42 +2748,42 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show NUMA information",
         .args_type  = "",
         .params     = "",
         .help       = "show NUMA information",

-        .mhandler.cmd = do_info_numa,
+        .mhandler.cmd = hmp_info_numa,

     },
     {
         .name       = "usb",
         .args_type  = "",
         .params     = "",
         .help       = "show guest USB devices",
     },
     {
         .name       = "usb",
         .args_type  = "",
         .params     = "",
         .help       = "show guest USB devices",

-        .mhandler.cmd = usb_info,
+        .mhandler.cmd = hmp_info_usb,

     },
     {
         .name       = "usbhost",
         .args_type  = "",
         .params     = "",
         .help       = "show host USB devices",
     },
     {
         .name       = "usbhost",
         .args_type  = "",
         .params     = "",
         .help       = "show host USB devices",

-        .mhandler.cmd = usb_host_info,
+        .mhandler.cmd = hmp_info_usbhost,

     },
     {
         .name       = "profile",
         .args_type  = "",
         .params     = "",
         .help       = "show profiling information",
     },
     {
         .name       = "profile",
         .args_type  = "",
         .params     = "",
         .help       = "show profiling information",

-        .mhandler.cmd = do_info_profile,
+        .mhandler.cmd = hmp_info_profile,

     },
     {
         .name       = "capture",
         .args_type  = "",
         .params     = "",
         .help       = "show capture information",
     },
     {
         .name       = "capture",
         .args_type  = "",
         .params     = "",
         .help       = "show capture information",

-        .mhandler.cmd = do_info_capture,
+        .mhandler.cmd = hmp_info_capture,

     },
     {
         .name       = "snapshots",
         .args_type  = "",
         .params     = "",
         .help       = "show the currently saved VM snapshots",
     },
     {
         .name       = "snapshots",
         .args_type  = "",
         .params     = "",
         .help       = "show the currently saved VM snapshots",

-        .mhandler.cmd = do_info_snapshots,
+        .mhandler.cmd = hmp_info_snapshots,

     },
     {
         .name       = "status",
     },
     {
         .name       = "status",


@@ -2846,7 +2834,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show CPU statistics",
         .args_type  = "",
         .params     = "",
         .help       = "show CPU statistics",

-        .mhandler.cmd = do_info_cpu_stats,
+        .mhandler.cmd = hmp_info_cpustats,

     },
 #if defined(CONFIG_SLIRP)
     {
     },
 #if defined(CONFIG_SLIRP)
     {


@@ -2854,7 +2842,7 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show user network stack connection states",
         .args_type  = "",
         .params     = "",
         .help       = "show user network stack connection states",

-        .mhandler.cmd = do_info_usernet,
+        .mhandler.cmd = hmp_info_usernet,

     },
 #endif
     {
     },
 #endif
     {


@@ -2890,28 +2878,35 @@ static mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show device tree",
         .args_type  = "",
         .params     = "",
         .help       = "show device tree",

-        .mhandler.cmd = do_info_qtree,
+        .mhandler.cmd = hmp_info_qtree,

     },
     {
         .name       = "qdm",
         .args_type  = "",
         .params     = "",
         .help       = "show qdev device model list",
     },
     {
         .name       = "qdm",
         .args_type  = "",
         .params     = "",
         .help       = "show qdev device model list",

-        .mhandler.cmd = do_info_qdm,
+        .mhandler.cmd = hmp_info_qdm,
+    },
+    {
+        .name       = "qom-tree",
+        .args_type  = "path:s?",
+        .params     = "[path]",
+        .help       = "show QOM composition tree",
+        .mhandler.cmd = hmp_info_qom_tree,

     },
     {
         .name       = "roms",
         .args_type  = "",
         .params     = "",
         .help       = "show roms",
     },
     {
         .name       = "roms",
         .args_type  = "",
         .params     = "",
         .help       = "show roms",

-        .mhandler.cmd = do_info_roms,
+        .mhandler.cmd = hmp_info_roms,

     },
     {
         .name       = "trace-events",
         .args_type  = "",
         .params     = "",
         .help       = "show available trace-events & their state",
     },
     {
         .name       = "trace-events",
         .args_type  = "",
         .params     = "",
         .help       = "show available trace-events & their state",

-        .mhandler.cmd = do_trace_print_events,
+        .mhandler.cmd = hmp_info_trace_events,

     },
     {
         .name       = "tpm",
     },
     {
         .name       = "tpm",


@@ -4597,8 +4592,13 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
         count = qemu_find_net_clients_except(NULL, ncs,
                                              NET_CLIENT_OPTIONS_KIND_NIC, 255);
         for (i = 0; i < count; i++) {
         count = qemu_find_net_clients_except(NULL, ncs,
                                              NET_CLIENT_OPTIONS_KIND_NIC, 255);
         for (i = 0; i < count; i++) {

+            int id;

             const char *name;
 
             const char *name;
 

+            if (ncs[i]->info->type == NET_CLIENT_OPTIONS_KIND_HUBPORT ||
+                net_hub_id_for_client(ncs[i], &id)) {
+                continue;
+            }

             name = ncs[i]->name;
             if (!strncmp(str, name, len)) {
                 readline_add_completion(rs, name);
             name = ncs[i]->name;
             if (!strncmp(str, name, len)) {
                 readline_add_completion(rs, name);


@@ -4689,11 +4689,13 @@ static void monitor_find_completion_by_table(Monitor *mon,
 
         if (cmd->sub_table) {
             /* do the job again */
 
         if (cmd->sub_table) {
             /* do the job again */

-            return monitor_find_completion_by_table(mon, cmd->sub_table,
-                                                    &args[1], nb_args - 1);
+            monitor_find_completion_by_table(mon, cmd->sub_table,
+                                             &args[1], nb_args - 1);
+            return;

         }
         if (cmd->command_completion) {
         }
         if (cmd->command_completion) {

-            return cmd->command_completion(mon->rs, nb_args, args[nb_args - 1]);
+            cmd->command_completion(mon->rs, nb_args, args[nb_args - 1]);
+            return;

         }
 
         ptype = next_arg_type(cmd->args_type);
         }
 
         ptype = next_arg_type(cmd->args_type);


@@ -4782,9 +4784,9 @@ static int monitor_can_read(void *opaque)
     return (mon->suspend_cnt == 0) ? 1 : 0;
 }
 
     return (mon->suspend_cnt == 0) ? 1 : 0;
 }
 

-static int invalid_qmp_mode(const Monitor *mon, const char *cmd_name)
+static int invalid_qmp_mode(const Monitor *mon, const mon_cmd_t *cmd)

 {
 {

-    int is_cap = compare_cmd(cmd_name, "qmp_capabilities");
+    int is_cap = cmd->mhandler.cmd_new == do_qmp_capabilities;

     return (qmp_cmd_mode(mon) ? is_cap : !is_cap);
 }
 
     return (qmp_cmd_mode(mon) ? is_cap : !is_cap);
 }
 


@@ -5078,14 +5080,10 @@ static void handle_qmp_command(JSONMessageParser *parser, QList *tokens)
 
     cmd_name = qdict_get_str(input, "execute");
     trace_handle_qmp_command(mon, cmd_name);
 
     cmd_name = qdict_get_str(input, "execute");
     trace_handle_qmp_command(mon, cmd_name);

-    if (invalid_qmp_mode(mon, cmd_name)) {
-        qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
-        goto err_out;
-    }
-

     cmd = qmp_find_cmd(cmd_name);
     cmd = qmp_find_cmd(cmd_name);

-    if (!cmd) {
-        qerror_report(QERR_COMMAND_NOT_FOUND, cmd_name);
+    if (!cmd || invalid_qmp_mode(mon, cmd)) {
+        qerror_report(ERROR_CLASS_COMMAND_NOT_FOUND,
+                      "The command %s has not been found", cmd_name);

         goto err_out;
     }
 
         goto err_out;
     }
 


@@ -5366,9 +5364,12 @@ static void bdrv_password_cb(void *opaque, const char *password,
     Monitor *mon = opaque;
     BlockDriverState *bs = readline_opaque;
     int ret = 0;
     Monitor *mon = opaque;
     BlockDriverState *bs = readline_opaque;
     int ret = 0;

+    Error *local_err = NULL;

 
 

-    if (bdrv_set_key(bs, password) != 0) {
-        monitor_printf(mon, "invalid password\n");
+    bdrv_add_key(bs, password, &local_err);
+    if (local_err) {
+        monitor_printf(mon, "%s\n", error_get_pretty(local_err));
+        error_free(local_err);

         ret = -EPERM;
     }
     if (mon->password_completion_cb)
         ret = -EPERM;
     }
     if (mon->password_completion_cb)


@@ -5388,18 +5389,6 @@ int monitor_read_bdrv_key_start(Monitor *mon, BlockDriverState *bs,
 {
     int err;
 
 {
     int err;
 

-    if (!bdrv_key_required(bs)) {
-        if (completion_cb)
-            completion_cb(opaque, 0);
-        return 0;
-    }
-
-    if (monitor_ctrl_mode(mon)) {
-        qerror_report(QERR_DEVICE_ENCRYPTED, bdrv_get_device_name(bs),
-                      bdrv_get_encrypted_filename(bs));
-        return -1;
-    }
-

     monitor_printf(mon, "%s (%s) is encrypted.\n", bdrv_get_device_name(bs),
                    bdrv_get_encrypted_filename(bs));
 
     monitor_printf(mon, "%s (%s) is encrypted.\n", bdrv_get_device_name(bs),
                    bdrv_get_encrypted_filename(bs));
 


@@ -5418,15 +5407,25 @@ int monitor_read_block_device_key(Monitor *mon, const char *device,
                                   BlockCompletionFunc *completion_cb,
                                   void *opaque)
 {
                                   BlockCompletionFunc *completion_cb,
                                   void *opaque)
 {

-    BlockDriverState *bs;
+    Error *err = NULL;
+    BlockBackend *blk;

 
 

-    bs = bdrv_find(device);
-    if (!bs) {
+    blk = blk_by_name(device);
+    if (!blk) {

         monitor_printf(mon, "Device not found %s\n", device);
         return -1;
     }
 
         monitor_printf(mon, "Device not found %s\n", device);
         return -1;
     }
 

-    return monitor_read_bdrv_key_start(mon, bs, completion_cb, opaque);
+    bdrv_add_key(blk_bs(blk), NULL, &err);
+    if (err) {
+        error_free(err);
+        return monitor_read_bdrv_key_start(mon, blk_bs(blk), completion_cb, opaque);
+    }
+
+    if (completion_cb) {
+        completion_cb(opaque, 0);
+    }
+    return 0;

 }
 
 QemuOptsList qemu_mon_opts = {
 }
 
 QemuOptsList qemu_mon_opts = {