diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-17 11:55:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-17 11:55:14 +0100 |
| commit | 5d0e5694470d2952b4f257bc985cac8c89b4fd92 (patch) | |
| tree | a045f8e047841645d1422ba1e2649199980414ab /docs | |
| parent | 53defa05701b4915dfbce0829e4fc0aef853af2d (diff) | |
| parent | 5f6b3561bf58395fd6c906d7064a1a5693a2e426 (diff) | |
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
virtio, acpi: fixes, cleanups
A bunch of minor fixes all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# gpg: Signature made Sun 16 Jun 2019 21:46:31 BST
# gpg: using RSA key 281F0DB8D28D5469
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [full]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [full]
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* remotes/mst/tags/for_upstream:
tests/rebuild-expected-aml.sh: blow out difflist
q35: update DSDT
q35: fix mmconfig and PCI0._CRS
hw/acpi: extract acpi_add_rom_blob()
vhost: fix vhost_log size overflow during migration
docs/vhost-user.json: some firmware.json copy leftovers
vhost-user-gpu: initialize msghdr & iov at declaration
vhost-user-input: check ioctl(EVIOCGNAME) return value
vhost-user: improve error report
vhost-user: check unix_listen() return value
vhost-user-gpu: do not send scanout update if no GPU socket
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/interop/vhost-user.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/interop/vhost-user.json b/docs/interop/vhost-user.json index ae88c03117..da6aaf51c8 100644 --- a/docs/interop/vhost-user.json +++ b/docs/interop/vhost-user.json @@ -178,11 +178,11 @@ # # - /usr/share/qemu/vhost-user/50-crosvm-gpu.json # -# then the sysadmin can prevent the default QEMU being used at all with +# then the sysadmin can prevent the default QEMU GPU being used at all with # # $ touch /etc/qemu/vhost-user/50-qemu-gpu.json # -# The sysadmin can replace/alter the distro default OVMF with +# The sysadmin can replace/alter the distro default QEMU GPU with # # $ vim /etc/qemu/vhost-user/50-qemu-gpu.json # @@ -190,7 +190,7 @@ # # $ vim /etc/qemu/vhost-user/10-qemu-gpu.json # -# or they can provide a parallel OVMF with lower priority +# or they can provide a parallel QEMU GPU with lower priority # # $ vim /etc/qemu/vhost-user/99-qemu-gpu.json # |