diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-15 18:44:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-15 18:44:48 +0100 |
| commit | 142f4ac5d5e024670ef4725e8943702b027e4218 (patch) | |
| tree | 244dd20bd9d562a7f22ea8aadefddff719557165 /qemu-options.hx | |
| parent | f2c85a2f36f57f155cda7bc9f7c42b44f1a2439e (diff) | |
| parent | 5edbdbcdf882e4220adc7dbf433351077cd1fbbc (diff) | |
| download | qemu-142f4ac5d5e024670ef4725e8943702b027e4218.tar.gz | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-2014-08-15' into staging
trivial patches for 2014-08-15
# gpg: Signature made Fri 15 Aug 2014 16:13:03 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 6F67 E18E 7C91 C5B1 5514 66A7 BEE5 9D74 A4C3 D7DB
* remotes/mjt/tags/trivial-patches-2014-08-15:
ivshmem: check the value returned by fstat()
l2cap: fix access to freed memory
intc: i8259: Convert Array allocation to g_new0
ppc: convert g_new(qemu_irq usages to g_new0
ssi: xilinx_spi: Initialise CS GPIOs as NULL
vl: free err
qemu-options.hx: fix typo about l2tpv3
vmxnet3: don't use 'Yoda conditions'
vl: don't use 'Yoda conditions'
spice: don't use 'Yoda conditions'
don't use 'Yoda conditions'
isa-bus: don't use 'Yoda conditions'
audio: don't use 'Yoda conditions'
usb: don't use 'Yoda conditions'
CODING_STYLE: Section about conditional statement
pci-host: update uncorresponding description
pci-host: update obsolete reference about piix_pci.c
qemu-options.hx: fix a typo of chardev
memory: Update obsolete comment about AddrRange field type
apic: Fix reported DFR content
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 96516c1e23..9d743e53da 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1444,7 +1444,7 @@ DEF("net", HAS_ARG, QEMU_OPTION_net, " use 'src=' to specify source address\n" " use 'dst=' to specify destination address\n" " use 'udp=on' to specify udp encapsulation\n" - " use 'dstport=' to specify destination udp port\n" + " use 'srcport=' to specify source udp port\n" " use 'dstport=' to specify destination udp port\n" " use 'ipv6=on' to force v6\n" " L2TPv3 uses cookies to prevent misconfiguration as\n" @@ -1926,7 +1926,7 @@ ETEXI DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, "-chardev null,id=id[,mux=on|off]\n" - "-chardev socket,id=id[,host=host],port=host[,to=to][,ipv4][,ipv6][,nodelay]\n" + "-chardev socket,id=id[,host=host],port=port[,to=to][,ipv4][,ipv6][,nodelay]\n" " [,server][,nowait][,telnet][,mux=on|off] (tcp)\n" "-chardev socket,id=id,path=path[,server][,nowait][,telnet],[mux=on|off] (unix)\n" "-chardev udp,id=id[,host=host],port=port[,localaddr=localaddr]\n" |