diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-20 13:54:52 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-20 13:54:52 +0200 |
| commit | 643bcbd667793141d75b39a3546dda41d66ff603 (patch) | |
| tree | d821818915c4bca2cd6c8b3ccef90ee44cc8fddd /qemu-monitor.hx | |
| parent | Merge commit '345c22aa80d1f6ddfe7898f721fd1be3bccb08f1' into stable-0.12-merge (diff) | |
| parent | Update version and changelog for 0.12.1 (diff) | |
| download | qemu-kvm-643bcbd667793141d75b39a3546dda41d66ff603.tar.gz qemu-kvm-643bcbd667793141d75b39a3546dda41d66ff603.tar.bz2 qemu-kvm-643bcbd667793141d75b39a3546dda41d66ff603.zip | |
Merge commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0' into stable-0.12-merge
* commit 'fe1b69708c72b163d3acdf2bb012e169d2d3dda0':
Update version and changelog for 0.12.1
Multiboot support: Fix rom_copy
roms: allow roms to be loaded at address 0
Update for 0.12.0 release
Update to SeaBIOS 0.5.0
Revert "monitor: Convert do_migrate_set_speed() to QObject"
e1000: Don't muck with PCI commmand register
monitor: do_balloon(): Use 'M' argument type
monitor: Introduce 'M' argument type
QMP: Update spec file
QMP: Update README file
QMP: Assure that returned data is a QDict
QMP: Return an empty dict by default
QMP: Only handle converted commands
Update SeaBIOS to include PCI based option rom loading
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index 7b5107037..9e3ea3cfb 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -763,8 +763,7 @@ ETEXI .args_type = "value:s", .params = "value", .help = "set maximum speed (in bytes) for migrations", - .user_print = monitor_user_noop, - .mhandler.cmd_new = do_migrate_set_speed, + .mhandler.cmd = do_migrate_set_speed, }, STEXI @@ -887,7 +886,7 @@ ETEXI { .name = "balloon", - .args_type = "value:i", + .args_type = "value:M", .params = "target", .help = "request VM to change it's memory allocation (in MB)", .user_print = monitor_user_noop, |