Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

[qemu.git] / docs / multiseat.txt

diff --git a/docs/multiseat.txt b/docs/multiseat.txt
index 814496e94c86b0d04a7099fa8187b80d39051576..2b297e979d6bc5519f308c30dfd89237a8244397 100644 (file)
--- a/docs/multiseat.txt
+++ b/docs/multiseat.txt
@@ -2,14 +2,14 @@
 multiseat howto (with some multihead coverage)
 ==============================================
 
-host side
----------
+host devices
+------------
 
 First you must compile qemu with a user interface supporting
 multihead/multiseat and input event routing.  Right now this
 list includes sdl2, gtk (both 2+3) and vnc:
 
-  ./configure --enable-sdl --with-sdlabi=2.0
+  ./configure --enable-sdl
 
 or
 
@@ -18,7 +18,7 @@ or
 
 Next put together the qemu command line (sdk/gtk):
 
-qemu   -enable-kvm -usb $memory $disk $whatever \
+qemu   -accel kvm -usb $memory $disk $whatever \
        -display [ sdl | gtk ] \
        -vga std \
        -device usb-tablet
@@ -41,6 +41,19 @@ The "display=video2" sets up the input routing.  Any input coming from
 the window which belongs to the video.2 display adapter will be routed
 to these input devices.
 
+Starting with qemu 2.4 and linux kernel 4.1 you can also use virtio
+for the input devices, using this ...
+
+       -device pci-bridge,addr=12.0,chassis_nr=2,id=head.2 \
+       -device secondary-vga,bus=head.2,addr=02.0,id=video.2 \
+       -device virtio-keyboard-pci,bus=head.2,addr=03.0,display=video.2 \
+       -device virtio-tablet-pci,bus=head.2,addr=03.0,display=video.2
+
+... instead of xhci and usb hid devices.
+
+host ui
+-------
+
 The sdl2 ui will start up with two windows, one for each display
 device.  The gtk ui will start with a single window and each display
 in a separate tab.  You can either simply switch tabs to switch heads,
@@ -49,7 +62,7 @@ to its own window so you can see both display devices side-by-side.
 
 For vnc some additional configuration on the command line is needed.
 We'll create two vnc server instances, and bind the second one to the
-second seat, simliar to input devices:
+second seat, similar to input devices:
 
        -display vnc=:1,id=primary \
        -display vnc=:2,id=secondary,display=video.2
@@ -110,7 +123,7 @@ Background info is here:
 guest side with pci-bridge-seat
 -------------------------------
 
-Qemu version FIXME and newer has a new pci-bridge-seat device which
+QEMU version 2.4 and newer has a new pci-bridge-seat device which
 can be used instead of pci-bridge.  Just swap the device name in the
 qemu command line above.  The only difference between the two devices
 is the pci id.  We can match the pci id instead of the device path
@@ -121,9 +134,10 @@ configuration:
     SUBSYSTEM=="pci", ATTR{vendor}=="0x1b36", ATTR{device}=="0x000a", \
             TAG+="seat", ENV{ID_AUTOSEAT}="1"
 
-Patch with this rule will be submitted to upstream udev/systemd, so
-long-term, when systemd with this lands in distros, things will work
-just fine without any manual guest configuration.
+Patch with this rule has been submitted to upstream udev/systemd, was
+accepted and should be included in the next systemd release (222).
+So, if your guest has this or a newer version, multiseat will work just
+fine without any manual guest configuration.
 
 Enjoy!