diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 18:44:49 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-10-14 18:44:49 -0300 |
| commit | 17b3a028beea7b222f626b658f64678d28083700 (patch) | |
| tree | b039ff39871aa706a60c9c0801f51930e79aca62 /qemu-monitor.hx | |
| parent | Merge commit 'af4ce882d530d4aa9ed26de3423a36e4a156d0a5' into upstream-merge (diff) | |
| parent | monitor: Convert do_info_cpus() to QObject (diff) | |
| download | qemu-kvm-17b3a028beea7b222f626b658f64678d28083700.tar.gz qemu-kvm-17b3a028beea7b222f626b658f64678d28083700.tar.bz2 qemu-kvm-17b3a028beea7b222f626b658f64678d28083700.zip | |
Merge commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe' into upstream-merge
* commit '8f3cec0be8ed3f7c3bfaf8521e6316bdb76a56fe':
monitor: Convert do_info_cpus() to QObject
monitor: Convert do_info_balloon() to QObject
monitor: Convert do_info_version() to QObject
monitor: Convert do_balloon() to QObject
monitor: Convert do_cont() to QObject
monitor: Convert do_system_powerdown() to QObject
monitor: Convert do_system_reset() to QObject
monitor: Convert do_stop() to QObject
monitor: Convert do_quit() do QObject
monitor: do_info(): handle new and old info handlers
monitor: Handle new and old style handlers
monitor: Add user_print() to mon_cmd_t
Conflicts:
monitor.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index e3ce8408c..547747886 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -40,7 +40,8 @@ ETEXI .args_type = "item:s?", .params = "[subcommand]", .help = "show various information about the system state", - .mhandler.cmd = do_info, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_info, }, STEXI @@ -118,7 +119,8 @@ ETEXI .args_type = "", .params = "", .help = "quit the emulator", - .mhandler.cmd = do_quit, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_quit, }, STEXI @@ -285,7 +287,8 @@ ETEXI .args_type = "", .params = "", .help = "stop emulation", - .mhandler.cmd = do_stop, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_stop, }, STEXI @@ -298,7 +301,8 @@ ETEXI .args_type = "", .params = "", .help = "resume emulation", - .mhandler.cmd = do_cont, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_cont, }, STEXI @@ -464,7 +468,8 @@ ETEXI .args_type = "", .params = "", .help = "reset the system", - .mhandler.cmd = do_system_reset, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_system_reset, }, STEXI @@ -478,7 +483,8 @@ ETEXI .args_type = "", .params = "", .help = "send system power down event", - .mhandler.cmd = do_system_powerdown, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_system_powerdown, }, STEXI @@ -868,7 +874,8 @@ ETEXI .args_type = "value:i", .params = "target", .help = "request VM to change it's memory allocation (in MB)", - .mhandler.cmd = do_balloon, + .user_print = monitor_user_noop, + .mhandler.cmd_new = do_balloon, }, STEXI |