Merge remote-tracking branch 'bonzini/stub' into staging

* bonzini/stub: (27 commits)
  build: improve quiet output for .stp rules
  build: fold trace-obj-y into libqemuutil.a
  build: some simplifications for "trace/Makefile.objs"
  build: remove coroutine-obj-y
  build: move version-obj-y to the generic LINK rule
  build: move base QAPI files to libqemuutil.a
  build: move QAPI definitions for QEMU out of qapi-obj-y
  build: consolidate multiple variables into universal-obj-y
  build: move qobject files to qobject/ and libqemuutil.a
  build: move libqemuutil.a components to util/
  build: move files away from tools-obj-y, common-obj-y, user-obj-y
  build: move util-obj-y to libqemuutil.a
  build: rename oslib-obj-y to util-obj-y
  libcacard: list oslib-obj-y file explicitly
  libcacard: link vscclient to dynamic library
  libcacard: rewrite Makefile in non-recursive style
  libcacard: add list of exported symbols
  libcacard: use per-target variable definitions
  libcacard: prepare to use -y trick in the Makefile
  libcacard: require libtool to build it
  ...

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --combined monitor.c
index c6eac608a3abc94b70f859fb876a2bc98c8d0b29,7b7221999c2996f651e2c7f492d7e276888b70e7..b7ac3a37a89a8c3e03d60507f0e53c83249ed3c7
--- 1/monitor.c
--- 2/monitor.c
+++ b/monitor.c
@@@ -270,7 -270,6 +270,7 @@@ static void monitor_puts(Monitor *mon, 
      char c;
  
      for(;;) {
 +        assert(mon->outbuf_index < sizeof(mon->outbuf) - 1);
          c = *str++;
          if (c == '\0')
              break;
@@@ -4791,3 -4790,25 +4791,25 @@@ int monitor_read_block_device_key(Monit
  
      return monitor_read_bdrv_key_start(mon, bs, completion_cb, opaque);
  }
+ 
+ QemuOptsList qemu_mon_opts = {
+     .name = "mon",
+     .implied_opt_name = "chardev",
+     .head = QTAILQ_HEAD_INITIALIZER(qemu_mon_opts.head),
+     .desc = {
+         {
+             .name = "mode",
+             .type = QEMU_OPT_STRING,
+         },{
+             .name = "chardev",
+             .type = QEMU_OPT_STRING,
+         },{
+             .name = "default",
+             .type = QEMU_OPT_BOOL,
+         },{
+             .name = "pretty",
+             .type = QEMU_OPT_BOOL,
+         },
+         { /* end of list */ }
+     },
+ };