diff options
author | Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-12-14 17:26:15 +0200 |
commit | 8bdb1d64b87089b23d18d02efbbbd85d44151742 (patch) | |
tree | e9cb246a234f120fddf1d801d529b5f93b073616 /monitor.c | |
parent | Merge commit '3be42b28c14e2826eebbced68ad3ceb92507401d' into stable-0.12-merge (diff) | |
parent | PCI: Convert pci_device_hot_add() to QObject (diff) | |
download | qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.gz qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.tar.bz2 qemu-kvm-8bdb1d64b87089b23d18d02efbbbd85d44151742.zip |
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>
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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", |