diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:40:29 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2009-09-29 09:40:29 -0300 |
| commit | 96db1a0255d1f20ad4953bd9eef9ca51bdd99982 (patch) | |
| tree | d4c8bc5a83b11f56bf04a4e7dbfd146f1ce762f7 /qemu-monitor.hx | |
| parent | Merge commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca' into upstream-merge (diff) | |
| parent | posix-aio-compat: avoid signal race when spawning a thread (diff) | |
| download | qemu-kvm-96db1a0255d1f20ad4953bd9eef9ca51bdd99982.tar.gz qemu-kvm-96db1a0255d1f20ad4953bd9eef9ca51bdd99982.tar.bz2 qemu-kvm-96db1a0255d1f20ad4953bd9eef9ca51bdd99982.zip | |
Merge commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4' into upstream-merge
* commit 'ee3993069ff55fa6f1c64daf1e09963e340db8e4':
posix-aio-compat: avoid signal race when spawning a thread
target-i386: kill a tmp register
target-i386: use subfi instead of sub with a non-freed constant
eepro100: Fix format strings in debug messages
eepro100: Replace sprintf by snprintf
eepro100: Remove unused code
eepro100: Enhanced logging and comments
fix -daemonize with kvm
Set SDL icon_title when using `-name XXX` for proper gnome-panel window list integration
qemu-option: rename bool -> boolean
ARM back-end: Use sxt[bh] instructions for ext{8, 6}s
Fix and improve qint_from_int64_test
monitor: Fix do_wav_capture() argument type
Conflicts:
vl.c
Signed-off-by: Marcelo Tosatti <mtosatti@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 a25fd3ec4..7ba8c9b21 100644 --- a/qemu-monitor.hx +++ b/qemu-monitor.hx @@ -402,7 +402,7 @@ info mice ETEXI #ifdef HAS_AUDIO - { "wavcapture", "path:s,freq:i?,bits:i?,nchannels:i?", do_wav_capture, + { "wavcapture", "path:F,freq:i?,bits:i?,nchannels:i?", do_wav_capture, "path [frequency [bits [channels]]]", "capture audio to a wave file (default frequency=44100 bits=16 channels=2)" }, #endif |