diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-23 13:15:34 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-07-23 13:15:34 -0500 |
| commit | ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5 (patch) | |
| tree | f3ac512465cc261cb6a3a70fba2da99b12231412 /qemu-options.hx | |
| parent | 400006c27622d54ef588e1a9bd5a005d5fc9be5b (diff) | |
| parent | 43ffe61f9cc22f9ad4d05a18a304b1095fa1f2b3 (diff) | |
| download | focaccia-qemu-ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5.tar.gz focaccia-qemu-ef6bbdf9e5eb6da5cbdea1bf55e08709c6e181d5.zip | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches: Fix some more Qemus in documentation and help text qdev: Fix Open Firmware comment cpus.c: Make all_cpu_threads_idle() static Use macro QEMU_PACKED for new packed structures Recognize PCID feature powerpc pci: fixed packing of ranges[]
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 97245a335c..dc68e15033 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1439,7 +1439,7 @@ 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. -You can either use a chardev directly and have that one used throughout Qemu's +You can either use a chardev directly and have that one used throughout QEMU's lifetime, like in the following example: @example @@ -1449,7 +1449,7 @@ qemu -net user,guestfwd=tcp:10.0.2.100:1234-tcp:10.10.1.1:4321 [...] @end example Or you can execute a command on every TCP connection established by the guest, -so that Qemu behaves similar to an inetd process for that virtual server: +so that QEMU behaves similar to an inetd process for that virtual server: @example # call "netcat 10.10.1.1 4321" on every TCP connection to 10.0.2.100:1234 |