[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 16/21] qemu-options: Use @itemx where appropriate
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 16/21] qemu-options: Use @itemx where appropriate |
Date: |
Mon, 22 Jun 2015 14:16:23 +0300 |
From: Markus Armbruster <address@hidden>
Doesn't appear to make a difference, but let's use it consistently.
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
qemu-options.hx | 52 ++++++++++++++++++++++++++--------------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/qemu-options.hx b/qemu-options.hx
index 39a472e..55d8ca9 100644
--- a/qemu-options.hx
+++ b/qemu-options.hx
@@ -118,7 +118,7 @@ DEF("numa", HAS_ARG, QEMU_OPTION_numa,
"-numa node[,memdev=id][,cpus=cpu[-cpu]][,nodeid=node]\n", QEMU_ARCH_ALL)
STEXI
@item -numa node[,address@hidden,address@hidden,address@hidden
address@hidden -numa node[,address@hidden,address@hidden,address@hidden
address@hidden -numa node[,address@hidden,address@hidden,address@hidden
@findex -numa
Simulate a multi node NUMA system. If @samp{mem}, @samp{memdev}
and @samp{cpus} are omitted, resources are split equally. Also, note
@@ -421,7 +421,7 @@ DEF("fda", HAS_ARG, QEMU_OPTION_fda,
DEF("fdb", HAS_ARG, QEMU_OPTION_fdb, "", QEMU_ARCH_ALL)
STEXI
@item -fda @var{file}
address@hidden -fdb @var{file}
address@hidden -fdb @var{file}
@findex -fda
@findex -fdb
Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}).
@@ -435,9 +435,9 @@ DEF("hdc", HAS_ARG, QEMU_OPTION_hdc,
DEF("hdd", HAS_ARG, QEMU_OPTION_hdd, "", QEMU_ARCH_ALL)
STEXI
@item -hda @var{file}
address@hidden -hdb @var{file}
address@hidden -hdc @var{file}
address@hidden -hdd @var{file}
address@hidden -hdb @var{file}
address@hidden -hdc @var{file}
address@hidden -hdd @var{file}
@findex -hda
@findex -hdb
@findex -hdc
@@ -1009,8 +1009,8 @@ Set the TCP port spice is listening on for plaintext
channels.
Set the IP address spice is listening on. Default is any address.
@item ipv4
address@hidden ipv6
address@hidden unix
address@hidden ipv6
address@hidden unix
Force using the specified IP version.
@item password=<secret>
@@ -1045,17 +1045,17 @@ Set the TCP port spice is listening on for encrypted
channels.
Set the x509 file directory. Expects same filenames as -vnc $display,x509=$dir
@item x509-key-file=<file>
address@hidden x509-key-password=<file>
address@hidden x509-cert-file=<file>
address@hidden x509-cacert-file=<file>
address@hidden x509-dh-key-file=<file>
address@hidden x509-key-password=<file>
address@hidden x509-cert-file=<file>
address@hidden x509-cacert-file=<file>
address@hidden x509-dh-key-file=<file>
The x509 file names can also be configured individually.
@item tls-ciphers=<list>
Specify which ciphers to use.
@item tls-channel=[main|display|cursor|inputs|record|playback]
address@hidden plaintext-channel=[main|display|cursor|inputs|record|playback]
address@hidden plaintext-channel=[main|display|cursor|inputs|record|playback]
Force specific channel to be used with or without TLS encryption. The
options can be specified multiple times to configure multiple
channels. The special name "default" can be used to set the default
@@ -1067,7 +1067,7 @@ Configure image compression (lossless).
Default is auto_glz.
@item jpeg-wan-compression=[auto|never|always]
address@hidden zlib-glz-wan-compression=[auto|never|always]
address@hidden zlib-glz-wan-compression=[auto|never|always]
Configure wan image compression (lossy for slow links).
Default is auto.
@@ -1605,7 +1605,7 @@ privilege to run. Valid options are:
Connect user mode stack to VLAN @var{n} (@var{n} = 0 is the default).
@item address@hidden
address@hidden address@hidden
address@hidden address@hidden
Assign symbolic name for use in monitor commands.
@item address@hidden/@var{mask}]
@@ -1712,7 +1712,7 @@ Then when you use on the host @code{telnet localhost
5555}, you
connect to the guest telnet server.
@item guestfwd=[tcp]:@var{server}:@address@hidden
address@hidden guestfwd=[tcp]:@var{server}:@address@hidden:command}
address@hidden guestfwd=[tcp]:@var{server}:@address@hidden:command}
Forward guest TCP connections to the IP address @var{server} on port @var{port}
to the character device @var{dev} or to a program executed by @var{cmd:command}
which gets spawned for each connection. This option can be given multiple
times.
@@ -1743,7 +1743,7 @@ syntax gives undefined results. Their use for new
applications is discouraged
as they will be removed from future versions.
@item -netdev
tap,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -net
tap[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -net
tap[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
Connect the host TAP network interface @var{name} to VLAN @var{n}.
Use the network script @var{file} to configure it and the network script
@@ -1783,7 +1783,7 @@ qemu-system-i386 linux.img \
@end example
@item -netdev bridge,address@hidden,address@hidden,address@hidden
address@hidden -net
bridge[,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -net
bridge[,address@hidden,address@hidden,address@hidden,address@hidden
Connect a host TAP network interface to a host bridge device.
Use the network helper @var{helper} to configure the TAP interface and
@@ -1806,7 +1806,7 @@ qemu-system-i386 linux.img -net bridge,br=qemubr0 -net
nic,model=virtio
@end example
@item -netdev
socket,address@hidden,address@hidden,address@hidden:@var{port}][,address@hidden:@var{port}]
address@hidden -net socket[,address@hidden,address@hidden,address@hidden
[,address@hidden:@var{port}][,address@hidden:@var{port}]
address@hidden -net socket[,address@hidden,address@hidden,address@hidden
[,address@hidden:@var{port}][,address@hidden:@var{port}]
Connect the VLAN @var{n} to a remote VLAN in another QEMU virtual
machine using a TCP socket connection. If @option{listen} is
@@ -1829,7 +1829,7 @@ qemu-system-i386 linux.img \
@end example
@item -netdev
socket,address@hidden,address@hidden,address@hidden:@var{port}[,address@hidden
address@hidden -net
socket[,address@hidden,address@hidden,address@hidden,address@hidden:@var{port}[,address@hidden
address@hidden -net
socket[,address@hidden,address@hidden,address@hidden,address@hidden:@var{port}[,address@hidden
Create a VLAN @var{n} shared with another QEMU virtual
machines using a UDP multicast socket, effectively making a bus for
@@ -1881,7 +1881,7 @@ qemu-system-i386 linux.img \
@end example
@item -netdev
l2tpv3,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,ipv6][,udp][,cookie64][,counter][,pincounter][,address@hidden,address@hidden,address@hidden
address@hidden -net
l2tpv3[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,ipv6][,udp][,cookie64][,counter][,pincounter][,address@hidden,address@hidden,address@hidden
address@hidden -net
l2tpv3[,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden,ipv6][,udp][,cookie64][,counter][,pincounter][,address@hidden,address@hidden,address@hidden
Connect VLAN @var{n} to L2TPv3 pseudowire. L2TPv3 (RFC3391) is a popular
protocol to transport Ethernet (and other Layer 2) data frames between
two systems. It is present in routers, firewalls and the Linux kernel
@@ -1902,7 +1902,7 @@ This transport allows a VM to communicate to another VM,
router or firewall dire
@item ipv6
force v6, otherwise defaults to v4.
@item address@hidden
address@hidden address@hidden
address@hidden address@hidden
Cookies are a weak form of security in the l2tpv3 specification.
Their function is mostly to prevent misconfiguration. By default they are 32
bit.
@@ -1940,7 +1940,7 @@ qemu-system-i386 linux.img -net nic -net
l2tpv3,src=4.2.3.1,dst=1.2.3.4,udp,srcp
@end example
@item -netdev
vde,address@hidden,address@hidden,address@hidden,address@hidden,address@hidden
address@hidden -net vde[,address@hidden,address@hidden,address@hidden
[,address@hidden,address@hidden,address@hidden
address@hidden -net vde[,address@hidden,address@hidden,address@hidden
[,address@hidden,address@hidden,address@hidden
Connect VLAN @var{n} to PORT @var{n} of a vde switch running on host and
listening for incoming connections on @var{socketpath}. Use GROUP
@var{groupname}
and MODE @var{octalmode} to change default ownership and permissions for
@@ -2239,7 +2239,7 @@ DragonFlyBSD hosts. It is an alias for @option{serial}.
@option{path} specifies the path to the tty. @option{path} is required.
@item -chardev parallel ,address@hidden ,address@hidden
address@hidden -chardev parport ,address@hidden ,address@hidden
address@hidden -chardev parport ,address@hidden ,address@hidden
@option{parallel} is only available on Linux, FreeBSD and DragonFlyBSD hosts.
@@ -3212,7 +3212,7 @@ Examples:
@table @code
@item -watchdog i6300esb -watchdog-action pause
address@hidden -watchdog ib700
address@hidden -watchdog ib700
@end table
ETEXI
@@ -3232,7 +3232,7 @@ instance you could use the either of the following to
change the escape
character to Control-t.
@table @code
@item -echr 0x14
address@hidden -echr 20
address@hidden -echr 20
@end table
ETEXI
@@ -3280,7 +3280,7 @@ DEF("incoming", HAS_ARG, QEMU_OPTION_incoming, \
QEMU_ARCH_ALL)
STEXI
@item -incoming tcp:address@hidden:@var{port}[,address@hidden,ipv4][,ipv6]
address@hidden -incoming rdma:@var{host}:@var{port}[,ipv4][,ipv6]
address@hidden -incoming rdma:@var{host}:@var{port}[,ipv4][,ipv6]
@findex -incoming
Prepare for incoming migration, listen on a given tcp port.
--
2.1.4
- [Qemu-devel] [PULL 20/21] hw/display/tcx.c: Fix memory leak, (continued)
- [Qemu-devel] [PULL 20/21] hw/display/tcx.c: Fix memory leak, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 21/21] util/qemu-sockets: improve ai_flag hints for ipv6 hosts, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 09/21] xen_pt: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 06/21] piix: piix3 QOMify, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 15/21] qemu-options: Improve -global documentation, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 05/21] pci-assign: QOMify, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 11/21] libcacard: pkgconfig: tidy dependent libs, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 03/21] Grammar: 'as to'->'as for', Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 13/21] hw/display/qxl-logger.c: Constify some variable, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 12/21] configure: rearrange --help and consolidate enable/disable together, Michael Tokarev, 2015/06/22
- [Qemu-devel] [PULL 16/21] qemu-options: Use @itemx where appropriate,
Michael Tokarev <=
- [Qemu-devel] [PULL 02/21] remove libdecnumber/dpd/decimal128Local.h, Michael Tokarev, 2015/06/22
- Re: [Qemu-devel] [PULL 00/21] Trivial patches for 2015-06-22, Peter Maydell, 2015/06/22