diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:34:29 -0600 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-10 08:34:29 -0600 |
commit | 7c12fd9b29c6ca2119396f143d84706f2fba6222 (patch) | |
tree | 4aec8a23b6899c8ef34e716b2328f5d443663503 /qemu-options.hx | |
parent | 8385b173a0ca4c2345434104e6cc2a7259adc4b9 (diff) | |
parent | 654598c944aa31cdbea435bd468055af9c918d16 (diff) | |
download | qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.zip qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.tar.gz qemu-7c12fd9b29c6ca2119396f143d84706f2fba6222.tar.bz2 |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
pc_sysfw: Plug memory leak on pc_fw_add_pflash_drv() error path
qemu-options: Fix space at EOL
Fix spelling in comments and documentation
Clean up pci_drive_hot_add()'s use of BlockInterfaceType
arm: a9mpcore: remove un-used ptimer_iomem field
target-sparc: Remove t0, t1 from CPUSPARCState
target-m68k: Remove t1 from CPUM68KState
target-alpha: Remove t0, t1 from CPUAlphaState
s390x: Spelling fixes (endianess -> endianness, occured -> occurred)
Fix comments (adress -> address, layed -> laid, wierd -> weird)
Fix spelling (prefered -> preferred)
configure: Remove stray debug output
sd: Send debug printfery to stderr not stdout
Conflicts:
configure
Resolve spelling conflict in configure.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.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 de43b1b..231cc4f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1331,7 +1331,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, " connect the host TAP network interface to VLAN 'n'\n" #else "-net tap[,vlan=n][,name=str][,fd=h][,ifname=name][,script=file][,downscript=dfile][,helper=helper][,sndbuf=nbytes][,vnet_hdr=on|off][,vhost=on|off][,vhostfd=h][,vhostforce=on|off]\n" - " connect the host TAP network interface to VLAN 'n' \n" + " connect the host TAP network interface to VLAN 'n'\n" " use network scripts 'file' (default=" DEFAULT_NETWORK_SCRIPT ")\n" " to configure it and 'dfile' (default=" DEFAULT_NETWORK_DOWN_SCRIPT ")\n" " to deconfigure it\n" |