Merge commit '85ed303bfe1f67a4c18ffe51916e73cffd7d9e9b' into upstream-merge

* commit '85ed303bfe1f67a4c18ffe51916e73cffd7d9e9b': (99 commits)
  qom: add a reference count to qdev objects
  tcg/arm: remove fixed map code buffer restriction
  doc: Remove Symbian Virtual Platform
  migration.h: remove incoming_expected declarations
  tcg: make tcg_const_ptr actually accept a pointer argument
  Fix spelling in comments, documentation and messages
  hw: Fix spelling in comments and code
  hw: Fix spelling in comments
  hw: Fix spelling (licenced->licensed)
  fmopl: Fix spelling in code and comments
  target-arm: Infer VFPv3 feature from VFPv4
  target-arm: Infer VFP feature from VFPv3
  target-arm: Infer Thumb division feature from M profile
  target-arm: Infer Thumb2 feature from ARMv7
  target-arm: Infer AUXCR feature from ARMv6
  target-arm: Infer ARMv6(K) feature from ARMv7
  target-arm: Infer ARMv6 feature from v6K
  target-arm: Infer ARMv5 feature from ARMv6
  target-arm: Infer ARMv4T feature from ARMv5
  arm: Fix CP15 FSR (C5) domain setting
  ...

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 9 insertions, 17 deletions

diff --git a/hmp-commands.hx b/hmp-commands.hx
index 3ddf2445b..787a47252 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -57,8 +57,7 @@ ETEXI
         .args_type  = "device:B,size:o",
         .params     = "device size",
         .help       = "resize a block image",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_block_resize,
+        .mhandler.cmd = hmp_block_resize,
     },
 
 STEXI
@@ -772,8 +771,7 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "cancel the current VM migration",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_migrate_cancel,
+        .mhandler.cmd = hmp_migrate_cancel,
     },
 
 STEXI
@@ -788,8 +786,7 @@ ETEXI
         .params     = "value",
         .help       = "set maximum speed (in bytes) for migrations. "
 	"Defaults to MB if no size suffix is specified, ie. B/K/M/G/T",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_migrate_set_speed,
+        .mhandler.cmd = hmp_migrate_set_speed,
     },
 
 STEXI
@@ -803,8 +800,7 @@ ETEXI
         .args_type  = "value:T",
         .params     = "value",
         .help       = "set maximum tolerated downtime (in seconds) for migrations",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_migrate_set_downtime,
+        .mhandler.cmd = hmp_migrate_set_downtime,
     },
 
 STEXI
@@ -841,7 +837,7 @@ ETEXI
                       "If format is specified, the snapshot file will\n\t\t\t"
                       "be created in that format. Otherwise the\n\t\t\t"
                       "snapshot will be internal! (currently unsupported)",
-        .mhandler.cmd_new = do_snapshot_blkdev,
+        .mhandler.cmd = hmp_snapshot_blkdev,
     },
 
 STEXI
@@ -919,7 +915,7 @@ ETEXI
                       "<tlb header> = 32bit x 4\n\t\t\t"
                       "<tlb header prefix> = 32bit x 4",
         .user_print  = pcie_aer_inject_error_print,
-        .mhandler.cmd_new = do_pcie_aer_inejct_error,
+        .mhandler.cmd_new = do_pcie_aer_inject_error,
     },
 
 STEXI
@@ -1022,9 +1018,7 @@ ETEXI
         .args_type  = "value:M",
         .params     = "target",
         .help       = "request VM to change its memory allocation (in MB)",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_async = do_balloon,
-        .flags      = MONITOR_CMD_ASYNC,
+        .mhandler.cmd = hmp_balloon,
     },
 
 STEXI
@@ -1038,8 +1032,7 @@ ETEXI
         .args_type  = "name:s,up:b",
         .params     = "name on|off",
         .help       = "change the link status of a network adapter",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_set_link,
+        .mhandler.cmd = hmp_set_link,
     },
 
 STEXI
@@ -1199,8 +1192,7 @@ ETEXI
         .args_type  = "device:B,password:s",
         .params     = "block_passwd device password",
         .help       = "set the password of encrypted block devices",
-        .user_print = monitor_user_noop,
-        .mhandler.cmd_new = do_block_set_passwd,
+        .mhandler.cmd = hmp_block_passwd,
     },
 
 STEXI