summary refs log tree commit diff stats
path: root/qmp-commands.hx
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2015-04-27 20:00:57 +0100
committerPeter Maydell <peter.maydell@linaro.org>2015-04-27 20:00:57 +0100
commit3d27b09cf6f62ec61c1330d0a811811a91e7514d (patch)
tree5c67fa76257090a0d5cb00a607e9eeb382a3679c /qmp-commands.hx
parent3f9d69ba12da6f2874631f6e426a7ef148ba4c82 (diff)
parent700cd855def54c2a9f2b6a016dcebf75fe19c238 (diff)
downloadfocaccia-qemu-3d27b09cf6f62ec61c1330d0a811811a91e7514d.tar.gz
focaccia-qemu-3d27b09cf6f62ec61c1330d0a811811a91e7514d.zip
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150427-1' into staging
spice: misc fixes.

# gpg: Signature made Mon Apr 27 12:03:16 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/spice/tags/pull-spice-20150427-1:
  spice: learn to hide cursor
  spice: set pointer position on hotspot
  spice: fix mouse cursor position
  spice: fix simple display on bigendian hosts
  monitor: Make client_migrate_info synchronous

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qmp-commands.hx')
-rw-r--r--qmp-commands.hx3
1 files changed, 1 insertions, 2 deletions
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 09f48bada5..1e59541665 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -785,8 +785,7 @@ EQMP
         .args_type  = "protocol:s,hostname:s,port:i?,tls-port:i?,cert-subject:s?",
         .params     = "protocol hostname port tls-port cert-subject",
         .help       = "send migration info to spice/vnc client",
-        .mhandler.cmd_async = client_migrate_info,
-        .flags      = MONITOR_CMD_ASYNC,
+        .mhandler.cmd_new = client_migrate_info,
     },
 
 SQMP