qemu-io: Move qemu_strsep() to cutils.c

[qemu.git] / monitor.c

diff --git a/monitor.c b/monitor.c
index 332abe76f3f2f373e3504878976b85597e95855e..9d279b81cf73f0c9deacf7177cd60c9300950ea4 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -63,7 +63,6 @@
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
 #endif
 #ifdef CONFIG_TRACE_SIMPLE
 #include "trace/simple.h"
 #endif

-#include "ui/qemu-spice.h"

 #include "exec/memory.h"
 #include "qmp-commands.h"
 #include "hmp.h"
 #include "exec/memory.h"
 #include "qmp-commands.h"
 #include "hmp.h"


@@ -94,10 +93,10 @@
  * 'M'          Non-negative target long (32 or 64 bit), in user mode the
  *              value is multiplied by 2^20 (think Mebibyte)
  * 'o'          octets (aka bytes)
  * 'M'          Non-negative target long (32 or 64 bit), in user mode the
  *              value is multiplied by 2^20 (think Mebibyte)
  * 'o'          octets (aka bytes)

- *              user mode accepts an optional T, t, G, g, M, m, K, k
- *              suffix, which multiplies the value by 2^40 for
- *              suffixes T and t, 2^30 for suffixes G and g, 2^20 for
- *              M and m, 2^10 for K and k
+ *              user mode accepts an optional E, e, P, p, T, t, G, g, M, m,
+ *              K, k suffix, which multiplies the value by 2^60 for suffixes E
+ *              and e, 2^50 for suffixes P and p, 2^40 for suffixes T and t,
+ *              2^30 for suffixes G and g, 2^20 for M and m, 2^10 for K and k

  * 'T'          double
  *              user mode accepts an optional ms, us, ns suffix,
  *              which divides the value by 1e3, 1e6, 1e9, respectively
  * 'T'          double
  *              user mode accepts an optional ms, us, ns suffix,
  *              which divides the value by 1e3, 1e6, 1e9, respectively


@@ -281,7 +280,7 @@ void monitor_flush(Monitor *mon)
     buf = qstring_get_str(mon->outbuf);
     len = qstring_get_length(mon->outbuf);
 
     buf = qstring_get_str(mon->outbuf);
     len = qstring_get_length(mon->outbuf);
 

-    if (mon && len && !mon->mux_out) {
+    if (len && !mon->mux_out) {

         rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len);
         if (rc == len) {
             /* all flushed */
         rc = qemu_chr_fe_write(mon->chr, (const uint8_t *) buf, len);
         if (rc == len) {
             /* all flushed */


@@ -496,6 +495,7 @@ static const char *monitor_event_names[] = {
     [QEVENT_WAKEUP] = "WAKEUP",
     [QEVENT_BALLOON_CHANGE] = "BALLOON_CHANGE",
     [QEVENT_SPICE_MIGRATE_COMPLETED] = "SPICE_MIGRATE_COMPLETED",
     [QEVENT_WAKEUP] = "WAKEUP",
     [QEVENT_BALLOON_CHANGE] = "BALLOON_CHANGE",
     [QEVENT_SPICE_MIGRATE_COMPLETED] = "SPICE_MIGRATE_COMPLETED",

+    [QEVENT_GUEST_PANICKED] = "GUEST_PANICKED",

 };
 QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)
 
 };
 QEMU_BUILD_BUG_ON(ARRAY_SIZE(monitor_event_names) != QEVENT_MAX)
 


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

-#ifdef HAS_AUDIO

 static void do_stop_capture(Monitor *mon, const QDict *qdict)
 {
     int i;
 static void do_stop_capture(Monitor *mon, const QDict *qdict)
 {
     int i;


@@ -1903,7 +1902,6 @@ static void do_wav_capture(Monitor *mon, const QDict *qdict)
     }
     QLIST_INSERT_HEAD (&capture_head, s, entries);
 }
     }
     QLIST_INSERT_HEAD (&capture_head, s, entries);
 }

-#endif

 
 static qemu_acl *find_acl(Monitor *mon, const char *name)
 {
 
 static qemu_acl *find_acl(Monitor *mon, const char *name)
 {