Merge commit '1c1d7bda2cd507aec72057a1c16094541add9dd6' into stable-0.12-merge

* commit '1c1d7bda2cd507aec72057a1c16094541add9dd6':
  PCI: Convert pci_device_hot_add() to QObject
  char: Convert qemu_chr_info() to QObject
  block: Convert bdrv_info_stats() to QObject
  block: Convert bdrv_info() to QObject
  migration: Convert do_info_migrate() to QObject

Conflicts:
	hw/pci-hotplug.c

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

1 files changed, 8 insertions, 4 deletions

diff --git a/monitor.c b/monitor.c
index 0d8fe3952..d1505d53c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2389,21 +2389,24 @@ static const mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show the character devices",
-        .mhandler.info = qemu_chr_info,
+        .user_print = qemu_chr_info_print,
+        .mhandler.info_new = qemu_chr_info,
     },
     {
         .name       = "block",
         .args_type  = "",
         .params     = "",
         .help       = "show the block devices",
-        .mhandler.info = bdrv_info,
+        .user_print = bdrv_info_print,
+        .mhandler.info_new = bdrv_info,
     },
     {
         .name       = "blockstats",
         .args_type  = "",
         .params     = "",
         .help       = "show block device statistics",
-        .mhandler.info = bdrv_info_stats,
+        .user_print = bdrv_stats_print,
+        .mhandler.info_new = bdrv_info_stats,
     },
     {
         .name       = "registers",
@@ -2600,7 +2603,8 @@ static const mon_cmd_t info_cmds[] = {
         .args_type  = "",
         .params     = "",
         .help       = "show migration status",
-        .mhandler.info = do_info_migrate,
+        .user_print = do_info_migrate_print,
+        .mhandler.info_new = do_info_migrate,
     },
     {
         .name       = "balloon",