diff options
| author | Peter Maydell | 2018-10-15 19:44:04 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-10-15 19:44:04 +0200 |
| commit | dddb37495b844270088e68e3bf30b764d48d863f (patch) | |
| tree | d35a295137d0e37e813a86afc3a04b7859d16323 /include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' ... (diff) | |
| parent | vfio-pci: make vfio-pci device more QOM conventional (diff) | |
| download | qemu-dddb37495b844270088e68e3bf30b764d48d863f.tar.gz qemu-dddb37495b844270088e68e3bf30b764d48d863f.tar.xz qemu-dddb37495b844270088e68e3bf30b764d48d863f.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20181015.0' into staging
VFIO updates 2018-10-15
- ramfb support for vfio-pci via new -nohotplug device variant
(Gerd Hoffmann)
- Preparation for generic DT pass-through in vfio-platform
(Geert Uytterhoeven & Eric Auger)
- vfio-pci QOM fixups (Li Qiang)
# gpg: Signature made Mon 15 Oct 2018 18:26:29 BST
# gpg: using RSA key 239B9B6E3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg: aka "Alex Williamson <alex@shazbot.org>"
# gpg: aka "Alex Williamson <alwillia@redhat.com>"
# gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>"
# Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22
* remotes/awilliam/tags/vfio-updates-20181015.0:
vfio-pci: make vfio-pci device more QOM conventional
hw/arm/virt: Allow dynamic vfio-platform devices again
hw/arm/sysbus-fdt: Allow device matching with DT compatible value
vfio/platform: Make the vfio-platform device non-abstract
hw/vfio/display: add ramfb support
stubs: add ramfb
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 2 | ||||
| -rw-r--r-- | include/hw/vfio/vfio-platform.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index 6be9a93f61..e46a28910a 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -26,6 +26,7 @@ #include "qemu/queue.h" #include "qemu/notify.h" #include "ui/console.h" +#include "hw/display/ramfb.h" #ifdef CONFIG_LINUX #include <linux/vfio.h> #endif @@ -147,6 +148,7 @@ typedef struct VFIODMABuf { typedef struct VFIODisplay { QemuConsole *con; + RAMFBState *ramfb; struct { VFIORegion buffer; DisplaySurface *surface; diff --git a/include/hw/vfio/vfio-platform.h b/include/hw/vfio/vfio-platform.h index 9baaa2db09..0ee10b1d71 100644 --- a/include/hw/vfio/vfio-platform.h +++ b/include/hw/vfio/vfio-platform.h @@ -54,7 +54,8 @@ typedef struct VFIOPlatformDevice { QLIST_HEAD(, VFIOINTp) intp_list; /* list of IRQs */ /* queue of pending IRQs */ QSIMPLEQ_HEAD(pending_intp_queue, VFIOINTp) pending_intp_queue; - char *compat; /* compatibility string */ + char *compat; /* DT compatible values, separated by NUL */ + unsigned int num_compat; /* number of compatible values */ uint32_t mmap_timeout; /* delay to re-enable mmaps after interrupt */ QEMUTimer *mmap_timer; /* allows fast-path resume after IRQ hit */ QemuMutex intp_mutex; /* protect the intp_list IRQ state */ |