diff options
| author |   Avi Kivity <avi@redhat.com> | 2010-01-17 15:39:57 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2010-01-17 15:39:57 +0200 |
| commit | b874ce1db7d8654850c8a6606b95ffb1c7d22ce2 (patch) | |
| tree | 0e031a914e520fdc6e86cd49c7b0156dd0decd92 /qemu-options.hx | |
| parent | Merge branch 'stable-0.12-upstream' into stable-0.12 (diff) | |
| parent | Update version and changelog for release (diff) | |
| download | qemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.tar.gz qemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.tar.bz2 qemu-kvm-b874ce1db7d8654850c8a6606b95ffb1c7d22ce2.zip | |
Merge remote branch 'upstream/stable-0.12' into stable-0.12
* upstream/stable-0.12: (27 commits)
Update version and changelog for release
Update SeaBIOS to 0.5.1
Qemu's internal TFTP server breaks lock-step-iness of TFTP
osdep.c: Fix accept4 fallback
pc: add rombar to compat properties for pc-0.10 and pc-0.11
pci: allow loading roms via fw_cfg.
roms: rework rom loading via fw
fw_cfg: rom loader tweaks.
roms: minor fixes and cleanups.
pc: add machine type for 0.12
loader: more ignores for rom intended to be loaded by the bios
vnc_refresh: return if vd->timer is NULL
QMP: Don't free async event's 'data'
Handle TFTP ERROR from client
dmg: fix ->open failure
virtio-pci: thinko fix
pc-bios: Update README (SeaBIOS)
vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow
remove pending exception on vcpu reset.
Fix CPU topology initialization
...
Conflicts:
hw/pc.c
hw/pci.h
qemu-options.hx
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 812d0670a..ca73ba5db 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1937,7 +1937,7 @@ DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig, "-readconfig <file>\n") DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig, "-writeconfig <file>\n" - " read/write config file") + " read/write config file\n") DEF("no-kvm", 0, QEMU_OPTION_no_kvm, "-no-kvm disable KVM hardware virtualization\n") |