diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-16 15:20:05 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-01-16 15:20:05 -0600 |
| commit | 47f4dac3fde809e3da4e60d9eb699f1d4b378249 (patch) | |
| tree | 0b466b044d1ef9180cdf7ae50ccf730b2e6f8dbb /qemu-options.hx | |
| parent | af381ebeacdefcec0d2b44bdbb9d6e01e35f691f (diff) | |
| parent | 0a1a7fabda7f0fa05ef09051be29e92e81f929ad (diff) | |
| download | focaccia-qemu-47f4dac3fde809e3da4e60d9eb699f1d4b378249.tar.gz focaccia-qemu-47f4dac3fde809e3da4e60d9eb699f1d4b378249.zip | |
Merge remote-tracking branch 'kraxel/chardev.1' into staging
# By Gerd Hoffmann # Via Gerd Hoffmann * kraxel/chardev.1: chardev: add pty chardev support to chardev-add (qmp) chardev: add socket chardev support to chardev-add (qmp) chardev: add parallel chardev support to chardev-add (qmp) chardev: add serial chardev support to chardev-add (qmp) chardev: add file chardev support to chardev-add (qmp) chardev: add hmp hotplug commands chardev: add qmp hotplug commands, with null chardev support chardev: reduce chardev ifdef mess a bit chardev: fix QemuOpts lifecycle chardev: add error reporting for qemu_chr_new_from_opts
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index 9df0cde64c..40cd68399d 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1742,9 +1742,11 @@ DEF("chardev", HAS_ARG, QEMU_OPTION_chardev, #endif #if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__) \ || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) + "-chardev serial,id=id,path=path[,mux=on|off]\n" "-chardev tty,id=id,path=path[,mux=on|off]\n" #endif #if defined(__linux__) || defined(__FreeBSD__) || defined(__DragonFly__) + "-chardev parallel,id=id,path=path[,mux=on|off]\n" "-chardev parport,id=id,path=path[,mux=on|off]\n" #endif #if defined(CONFIG_SPICE) @@ -1775,6 +1777,7 @@ Backend is one of: @option{stdio}, @option{braille}, @option{tty}, +@option{parallel}, @option{parport}, @option{spicevmc}. @option{spiceport}. @@ -1910,8 +1913,8 @@ take any options. Send traffic from the guest to a serial device on the host. -@option{serial} is -only available on Windows hosts. +On Unix hosts serial will actually accept any tty device, +not only serial lines. @option{path} specifies the name of the serial device to open. @@ -1937,16 +1940,15 @@ Connect to a local BrlAPI server. @option{braille} does not take any options. @item -chardev tty ,id=@var{id} ,path=@var{path} -Connect to a local tty device. - @option{tty} is only available on Linux, Sun, FreeBSD, NetBSD, OpenBSD and -DragonFlyBSD hosts. +DragonFlyBSD hosts. It is an alias for -serial. @option{path} specifies the path to the tty. @option{path} is required. +@item -chardev parallel ,id=@var{id} ,path=@var{path} @item -chardev parport ,id=@var{id} ,path=@var{path} -@option{parport} is only available on Linux, FreeBSD and DragonFlyBSD hosts. +@option{parallel} is only available on Linux, FreeBSD and DragonFlyBSD hosts. Connect to a local parallel port. |