diff options
| author | Peter Maydell | 2019-03-12 14:37:29 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-03-12 14:37:29 +0100 |
| commit | 46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1 (patch) | |
| tree | 6e0e6dc9e24d4e8696faf53ba8030cde536e6eba /hw/vfio/pci.h | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-reques... (diff) | |
| parent | vfio/display: delay link up event (diff) | |
| download | qemu-46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1.tar.gz qemu-46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1.tar.xz 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 'hw/vfio/pci.h')
| -rw-r--r-- | hw/vfio/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h index b1ae4c0754..c11c3f1670 100644 --- a/hw/vfio/pci.h +++ b/hw/vfio/pci.h @@ -149,6 +149,8 @@ typedef struct VFIOPCIDevice { #define VFIO_FEATURE_ENABLE_IGD_OPREGION \ (1 << VFIO_FEATURE_ENABLE_IGD_OPREGION_BIT) OnOffAuto display; + uint32_t display_xres; + uint32_t display_yres; int32_t bootindex; uint32_t igd_gms; OffAutoPCIBAR msix_relo; |