aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-09-29 09:35:25 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2009-09-29 09:35:25 -0300
commit8e53a621cc5708f8409e288161f15b49f239ab75 (patch)
tree9a9ed6d460e88f045a6ad1831709ca15e5a6a0bc /qemu-monitor.hx
parentMerge commit '52d946208e9cc2e958b4d3ad18914a51bdbe197a' into upstream-merge (diff)
parentmonitor: Fix do_commit() argument type (diff)
downloadqemu-kvm-8e53a621cc5708f8409e288161f15b49f239ab75.tar.gz
qemu-kvm-8e53a621cc5708f8409e288161f15b49f239ab75.tar.bz2
qemu-kvm-8e53a621cc5708f8409e288161f15b49f239ab75.zip
Merge commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca' into upstream-merge
* commit '075e36b8ede5409b491abdf69fe2ffcf1bfe6bca': (27 commits) monitor: Fix do_commit() argument type Don't redefine NULL, please Fix coding style issue Remove PARAMS() macro __thread should be before real type gcc wants 1st static and then const Bring two last users of K&R definitions to ANSI c89 static and inline should came before the type of the functions Use proper typedef syntax Revert "This files are compiled in libqemu.a now" fix use after free unbreak usb pass-through on linux. clean: remove ide/*.o files on clean ARM host: fix generated blocks linking Fix spelling in comment Suppress some variants of English in comments sparc64-8bit-asi target-mips: remove MAX_OP_PER_INSTR workaround exec-all.h: increase OPC_BUF_SIZE exec-all.h: increase MAX_OP_PER_INSTR to 96 from 64 ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-monitor.hx')
-rw-r--r--qemu-monitor.hx2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-monitor.hx b/qemu-monitor.hx
index a889fed99..a25fd3ec4 100644
--- a/qemu-monitor.hx
+++ b/qemu-monitor.hx
@@ -15,7 +15,7 @@ STEXI
Show the help for all commands or just for command @var{cmd}.
ETEXI
- { "commit", "device:s", do_commit,
+ { "commit", "device:B", do_commit,
"device|all", "commit changes to the disk images (if -snapshot is used) or backing files" },
STEXI
@item commit