diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 13:37:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-12 13:37:29 +0000 |
| commit | 46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1 (patch) | |
| tree | 6e0e6dc9e24d4e8696faf53ba8030cde536e6eba /include/hw/vfio/vfio-common.h | |
| parent | a6d3c238034c8a90a0a2cee7814741ff1384e66f (diff) | |
| parent | 8781c701445d83145ac1e69714e76a643f5525da (diff) | |
| download | focaccia-qemu-46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1.tar.gz focaccia-qemu-46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1.zip | |
Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190311.0' into staging
VFIO updates 2019-03-11 - Resolution support for mdev displays supporting EDID interface (Gerd Hoffmann) # gpg: Signature made Mon 11 Mar 2019 19:17:39 GMT # gpg: using RSA key 239B9B6E3BB08B22 # gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>" [full] # gpg: aka "Alex Williamson <alex@shazbot.org>" [full] # gpg: aka "Alex Williamson <alwillia@redhat.com>" [full] # gpg: aka "Alex Williamson <alex.l.williamson@gmail.com>" [full] # Primary key fingerprint: 42F6 C04E 540B D1A9 9E7B 8A90 239B 9B6E 3BB0 8B22 * remotes/awilliam/tags/vfio-updates-20190311.0: vfio/display: delay link up event vfio/display: add xres + yres properties vfio/display: add edid support. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/hw/vfio/vfio-common.h')
| -rw-r--r-- | include/hw/vfio/vfio-common.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/hw/vfio/vfio-common.h b/include/hw/vfio/vfio-common.h index fbf0966af4..1155b79678 100644 --- a/include/hw/vfio/vfio-common.h +++ b/include/hw/vfio/vfio-common.h @@ -148,6 +148,10 @@ typedef struct VFIODMABuf { typedef struct VFIODisplay { QemuConsole *con; RAMFBState *ramfb; + struct vfio_region_info *edid_info; + struct vfio_region_gfx_edid *edid_regs; + uint8_t *edid_blob; + QEMUTimer *edid_link_timer; struct { VFIORegion buffer; DisplaySurface *surface; |