Use #include "..." for our own headers, <...> for others

[qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index e99ca8c91e28d3112716af2fc295f1fdddbbb96e..d6335d3da4235e9776909241c65290f3e5bd9f25 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -23,6 +23,8 @@
  */
 #include "qemu/osdep.h"
 #include <dirent.h>
  */
 #include "qemu/osdep.h"
 #include <dirent.h>

+#include "qemu-common.h"
+#include "cpu.h"

 #include "hw/hw.h"
 #include "monitor/qdev.h"
 #include "hw/usb.h"
 #include "hw/hw.h"
 #include "monitor/qdev.h"
 #include "hw/usb.h"


@@ -42,6 +44,7 @@
 #include "ui/console.h"
 #include "ui/input.h"
 #include "sysemu/blockdev.h"
 #include "ui/console.h"
 #include "ui/input.h"
 #include "sysemu/blockdev.h"

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

 #include "audio/audio.h"
 #include "disas/disas.h"
 #include "sysemu/balloon.h"
 #include "audio/audio.h"
 #include "disas/disas.h"
 #include "sysemu/balloon.h"


@@ -51,15 +54,11 @@
 #include "qemu/acl.h"
 #include "sysemu/tpm.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/acl.h"
 #include "sysemu/tpm.h"
 #include "qapi/qmp/qerror.h"

-#include "qapi/qmp/qint.h"
-#include "qapi/qmp/qfloat.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qstring.h"
+#include "qapi/qmp/types.h"

 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/json-parser.h"

-#include <qom/object_interfaces.h>
+#include "qom/object_interfaces.h"

 #include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"
 #include "cpu.h"
 #include "trace.h"
 #include "trace/control.h"


@@ -68,6 +67,8 @@
 #include "trace/simple.h"
 #endif
 #include "exec/memory.h"
 #include "trace/simple.h"
 #endif
 #include "exec/memory.h"

+#include "exec/exec-all.h"
+#include "qemu/log.h"

 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu/thread.h"
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "qemu/thread.h"


@@ -76,6 +77,8 @@
 #include "qapi-event.h"
 #include "qmp-introspect.h"
 #include "sysemu/block-backend.h"
 #include "qapi-event.h"
 #include "qmp-introspect.h"
 #include "sysemu/block-backend.h"

+#include "sysemu/qtest.h"
+#include "qemu/cutils.h"

 
 /* for hmp_info_irq/pic */
 #if defined(TARGET_SPARC)
 
 /* for hmp_info_irq/pic */
 #if defined(TARGET_SPARC)


@@ -232,6 +235,8 @@ static const mon_cmd_t qmp_cmds[];
 
 Monitor *cur_mon;
 
 
 Monitor *cur_mon;
 

+static QEMUClockType event_clock_type = QEMU_CLOCK_REALTIME;
+

 static void monitor_command_cb(void *opaque, const char *cmdline,
                                void *readline_opaque);
 
 static void monitor_command_cb(void *opaque, const char *cmdline,
                                void *readline_opaque);
 


@@ -311,7 +316,7 @@ static void monitor_flush_locked(Monitor *mon)
             return;
         }
         if (rc > 0) {
             return;
         }
         if (rc > 0) {

-            /* partinal write */
+            /* partial write */

             QString *tmp = qstring_from_str(buf + rc);
             QDECREF(mon->outbuf);
             mon->outbuf = tmp;
             QString *tmp = qstring_from_str(buf + rc);
             QDECREF(mon->outbuf);
             mon->outbuf = tmp;


@@ -513,7 +518,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)
              * monitor_qapi_event_handler() in evconf->rate ns.  Any
              * events arriving before then will be delayed until then.
              */
              * monitor_qapi_event_handler() in evconf->rate ns.  Any
              * events arriving before then will be delayed until then.
              */

-            int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
+            int64_t now = qemu_clock_get_ns(event_clock_type);

 
             monitor_qapi_event_emit(event, qdict);
 
 
             monitor_qapi_event_emit(event, qdict);
 


@@ -522,7 +527,7 @@ monitor_qapi_event_queue(QAPIEvent event, QDict *qdict, Error **errp)
             evstate->data = data;
             QINCREF(evstate->data);
             evstate->qdict = NULL;
             evstate->data = data;
             QINCREF(evstate->data);
             evstate->qdict = NULL;

-            evstate->timer = timer_new_ns(QEMU_CLOCK_REALTIME,
+            evstate->timer = timer_new_ns(event_clock_type,

                                           monitor_qapi_event_handler,
                                           evstate);
             g_hash_table_add(monitor_qapi_event_state, evstate);
                                           monitor_qapi_event_handler,
                                           evstate);
             g_hash_table_add(monitor_qapi_event_state, evstate);


@@ -547,7 +552,7 @@ static void monitor_qapi_event_handler(void *opaque)
     qemu_mutex_lock(&monitor_lock);
 
     if (evstate->qdict) {
     qemu_mutex_lock(&monitor_lock);
 
     if (evstate->qdict) {

-        int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME);
+        int64_t now = qemu_clock_get_ns(event_clock_type);

 
         monitor_qapi_event_emit(evstate->event, evstate->qdict);
         QDECREF(evstate->qdict);
 
         monitor_qapi_event_emit(evstate->event, evstate->qdict);
         QDECREF(evstate->qdict);


@@ -572,6 +577,10 @@ static unsigned int qapi_event_throttle_hash(const void *key)
         hash += g_str_hash(qdict_get_str(evstate->data, "id"));
     }
 
         hash += g_str_hash(qdict_get_str(evstate->data, "id"));
     }
 

+    if (evstate->event == QAPI_EVENT_QUORUM_REPORT_BAD) {
+        hash += g_str_hash(qdict_get_str(evstate->data, "node-name"));
+    }
+

     return hash;
 }
 
     return hash;
 }
 


@@ -589,11 +598,20 @@ static gboolean qapi_event_throttle_equal(const void *a, const void *b)
                        qdict_get_str(evb->data, "id"));
     }
 
                        qdict_get_str(evb->data, "id"));
     }
 

+    if (eva->event == QAPI_EVENT_QUORUM_REPORT_BAD) {
+        return !strcmp(qdict_get_str(eva->data, "node-name"),
+                       qdict_get_str(evb->data, "node-name"));
+    }
+

     return TRUE;
 }
 
 static void monitor_qapi_event_init(void)
 {
     return TRUE;
 }
 
 static void monitor_qapi_event_init(void)
 {

+    if (qtest_enabled()) {
+        event_clock_type = QEMU_CLOCK_VIRTUAL;
+    }
+

     monitor_qapi_event_state = g_hash_table_new(qapi_event_throttle_hash,
                                                 qapi_event_throttle_equal);
     qmp_event_set_func_emit(monitor_qapi_event_queue);
     monitor_qapi_event_state = g_hash_table_new(qapi_event_throttle_hash,
                                                 qapi_event_throttle_equal);
     qmp_event_set_func_emit(monitor_qapi_event_queue);


@@ -1089,7 +1107,12 @@ void qmp_client_migrate_info(const char *protocol, const char *hostname,
 
 static void hmp_logfile(Monitor *mon, const QDict *qdict)
 {
 
 static void hmp_logfile(Monitor *mon, const QDict *qdict)
 {

-    qemu_set_log_filename(qdict_get_str(qdict, "filename"));
+    Error *err = NULL;
+
+    qemu_set_log_filename(qdict_get_str(qdict, "filename"), &err);
+    if (err) {
+        error_report_err(err);
+    }

 }
 
 static void hmp_log(Monitor *mon, const QDict *qdict)
 }
 
 static void hmp_log(Monitor *mon, const QDict *qdict)


@@ -1506,9 +1529,9 @@ int64_t dev_time;
 static void hmp_info_profile(Monitor *mon, const QDict *qdict)
 {
     monitor_printf(mon, "async time  %" PRId64 " (%0.3f)\n",
 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());
+                   dev_time, dev_time / (double)NANOSECONDS_PER_SECOND);

     monitor_printf(mon, "qemu time   %" PRId64 " (%0.3f)\n",
     monitor_printf(mon, "qemu time   %" PRId64 " (%0.3f)\n",

-                   tcg_time, tcg_time / (double)get_ticks_per_sec());
+                   tcg_time, tcg_time / (double)NANOSECONDS_PER_SECOND);

     tcg_time = 0;
     dev_time = 0;
 }
     tcg_time = 0;
     dev_time = 0;
 }


@@ -3409,11 +3432,13 @@ void host_net_remove_completion(ReadLineState *rs, int nb_args, const char *str)
 static void vm_completion(ReadLineState *rs, const char *str)
 {
     size_t len;
 static void vm_completion(ReadLineState *rs, const char *str)
 {
     size_t len;

-    BlockDriverState *bs = NULL;
+    BlockDriverState *bs;
+    BdrvNextIterator it;

 
     len = strlen(str);
     readline_set_completion_index(rs, len);
 
     len = strlen(str);
     readline_set_completion_index(rs, len);

-    while ((bs = bdrv_next(bs))) {
+
+    for (bs = bdrv_first(&it); bs; bs = bdrv_next(&it)) {

         SnapshotInfoList *snapshots, *snapshot;
         AioContext *ctx = bdrv_get_aio_context(bs);
         bool ok = false;
         SnapshotInfoList *snapshots, *snapshot;
         AioContext *ctx = bdrv_get_aio_context(bs);
         bool ok = false;


@@ -3467,7 +3492,7 @@ static void monitor_find_completion_by_table(Monitor *mon,
     int i;
     const char *ptype, *str, *name;
     const mon_cmd_t *cmd;
     int i;
     const char *ptype, *str, *name;
     const mon_cmd_t *cmd;

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

 
     if (nb_args <= 1) {
         /* command completion */
 
     if (nb_args <= 1) {
         /* command completion */


@@ -3522,8 +3547,8 @@ static void monitor_find_completion_by_table(Monitor *mon,
         case 'B':
             /* block device name completion */
             readline_set_completion_index(mon->rs, strlen(str));
         case 'B':
             /* block device name completion */
             readline_set_completion_index(mon->rs, strlen(str));

-            for (bs = bdrv_next(NULL); bs; bs = bdrv_next(bs)) {
-                name = bdrv_get_device_name(bs);
+            while ((blk = blk_next(blk)) != NULL) {
+                name = blk_name(blk);

                 if (str[0] == '\0' ||
                     !strncmp(name, str, strlen(str))) {
                     readline_add_completion(mon->rs, name);
                 if (str[0] == '\0' ||
                     !strncmp(name, str, strlen(str))) {
                     readline_add_completion(mon->rs, name);


@@ -4241,3 +4266,24 @@ void qmp_dump_skeys(const char *filename, Error **errp)
     error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys");
 }
 #endif
     error_setg(errp, QERR_FEATURE_DISABLED, "dump-skeys");
 }
 #endif

+
+#ifndef TARGET_ARM
+GICCapabilityList *qmp_query_gic_capabilities(Error **errp)
+{
+    error_setg(errp, QERR_FEATURE_DISABLED, "query-gic-capabilities");
+    return NULL;
+}
+#endif
+
+HotpluggableCPUList *qmp_query_hotpluggable_cpus(Error **errp)
+{
+    MachineState *ms = MACHINE(qdev_get_machine());
+    MachineClass *mc = MACHINE_GET_CLASS(ms);
+
+    if (!mc->query_hotpluggable_cpus) {
+        error_setg(errp, QERR_FEATURE_DISABLED, "query-hotpluggable-cpus");
+        return NULL;
+    }
+
+    return mc->query_hotpluggable_cpus(ms);
+}