diff options
| author |   Avi Kivity <avi@redhat.com> | 2009-12-20 12:28:51 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-20 12:28:51 +0200 |
| commit | 210cd710b3bd36ca3c10e68b976f22319438f5ce (patch) | |
| tree | 1031d5445f5513a414a7fa570d7a2b7f964428ea /qemu-monitor.hx | |
| parent | Merge commit '686a3c3dc235df2492e754423799d1abe4f6d9e2' into stable-0.12-merge (diff) | |
| parent | Make sure to enable dirty tracking of VBE vram mapping (diff) | |
| download | qemu-kvm-210cd710b3bd36ca3c10e68b976f22319438f5ce.tar.gz qemu-kvm-210cd710b3bd36ca3c10e68b976f22319438f5ce.tar.bz2 qemu-kvm-210cd710b3bd36ca3c10e68b976f22319438f5ce.zip | |
Merge commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3' into stable-0.12-merge
* commit '3c547d7bb7889182d5bcecbb3edea4c71774c6a3': (23 commits)
Make sure to enable dirty tracking of VBE vram mapping
vmware: setup PCI BAR 2 for FIFO as per vmware spec
qdev: improve property error reporting.
fix vga names in default_list
usb-host: check mon before using it.
usb-net: use qdev for -usbdevice
Check rom_load_all() return value.
defaults: update device_list[]
defaults: split default_drive
monitor: Catch printing to non-existent monitor
monitor: Avoid readline functions in QMP
monitor: do_balloon(): Check for errors
monitor: Use 'device' in eject
QDict: Fix size update
qdev: Improve uni-north device names
Avoid permanently disabled QEMU monitor when UNIX migration fails
Fix loading of ELF multiboot kernels
Revert "Rename DriveInfo.onerror to on_write_error" (fix mismerge)
qemu-io: Fix memory leak
Fix thinko in linuxboot.S
...
Conflicts:
hw/vga.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
| -rw-r--r-- | qemu-monitor.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx index de5b9feb4..7b5107037 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -130,7 +130,7 @@ ETEXI { .name = "eject", - .args_type = "force:-f,filename:B", + .args_type = "force:-f,device:B", .params = "[-f] device", .help = "eject a removable medium (use -f to force it)", .user_print = monitor_user_noop, |