Merge commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10' into upstream-merge

* commit '59c7b155aa6e1cbfe8a92e2322ea59ab31965c10': (81 commits)
  posix-aio-compat: Split out posix_aio_process_queue
  monitor: Convert do_closefd() to QObject
  monitor: Convert do_getfd() to QObject
  monitor: Convert do_eject() to QObject
  monitor: Convert do_pci_device_hot_remove() to QObject
  monitor: Convert do_migrate_cancel() to QObject
  monitor: Convert do_migrate_set_speed() to QObject
  monitor: Convert do_migrate() to QObject
  monitor: Convert do_physical_memory_save() to QObject
  monitor: Convert do_memory_save() to QObject
  lsi_scsi: port to vmstate
  vmstate: Add VMSTATE_BUFFER_UNSAFE
  vmware_vga: port to vmstate
  vmware_vga: the support to change dinamically depth is not there
  vmware_vga: scratch is really an array of uint32_t
  vmware_vga: remove !EMBED_STDVGA code
  vmware_vga: qemu_malloc() returns void *
  vmware_vga: Remove uselss casts from void *
  vmware_vga: Pass pci_vmsga_state_t arg no VGACommonState
  vga: remove unused vga_common_save/load
  ...

Conflicts:
	posix-aio-compat.c

Signed-off-by: Mark McLoughlin <markmc@redhat.com>

1 files changed, 3 insertions, 0 deletions

diff --git a/qemu-config.c b/qemu-config.c
index 4fb789811..b4cebca06 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -138,6 +138,9 @@ QemuOptsList qemu_chardev_opts = {
         },{
             .name = "mux",
             .type = QEMU_OPT_BOOL,
+        },{
+            .name = "signal",
+            .type = QEMU_OPT_BOOL,
         },
         { /* end if list */ }
     },