summary refs log tree commit diff stats
path: root/hmp-commands.hx
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-03-19 08:51:06 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-19 08:51:06 -0500
commit5c20f4e54a311620861c659dec29d0ee402e8b93 (patch)
tree4e35db5155d8539650df69e629cc1a009ae54579 /hmp-commands.hx
parent46a5801d0cb5f5ed01a4d31c0e7cc581237ed5ce (diff)
parente1c37d0e94048502f9874e6356ce7136d4b05bdb (diff)
downloadfocaccia-qemu-5c20f4e54a311620861c659dec29d0ee402e8b93.tar.gz
focaccia-qemu-5c20f4e54a311620861c659dec29d0ee402e8b93.zip
Merge remote-tracking branch 'qmp/queue/qmp' into staging
* qmp/queue/qmp:
  qapi: Convert migrate
  Purge migration of (almost) everything to do with monitors
  Error: Introduce error_copy()
  QError: Introduce new errors for the migration command
Diffstat (limited to 'hmp-commands.hx')
-rw-r--r--hmp-commands.hx3
1 files changed, 1 insertions, 2 deletions
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 6980214a1a..bd35a3eb08 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -806,8 +806,7 @@ ETEXI
 		      " full copy of disk\n\t\t\t -i for migration without "
 		      "shared storage with incremental copy of disk "
 		      "(base image shared between src and destination)",
-        .user_print = monitor_user_noop,	
-	.mhandler.cmd_new = do_migrate,
+        .mhandler.cmd = hmp_migrate,
     },