From: Peter Maydell Date: Tue, 12 Mar 2019 13:37:29 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20190311.0' into... X-Git-Tag: v4.0.0-rc0~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1;p=thirdparty%2Fqemu.git 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 " [full] # gpg: aka "Alex Williamson " [full] # gpg: aka "Alex Williamson " [full] # gpg: aka "Alex Williamson " [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 --- 46316f1dfffc6be72e94e89f7b0e9162e7dcdcf1 diff --cc hw/vfio/trace-events index cf1e8868182,decbde495ac..22019728e07 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@@ -129,6 -129,13 +129,13 @@@ vfio_prereg_listener_region_add_skip(ui vfio_prereg_listener_region_del_skip(uint64_t start, uint64_t end) "0x%"PRIx64" - 0x%"PRIx64 vfio_prereg_register(uint64_t va, uint64_t size, int ret) "va=0x%"PRIx64" size=0x%"PRIx64" ret=%d" vfio_prereg_unregister(uint64_t va, uint64_t size, int ret) "va=0x%"PRIx64" size=0x%"PRIx64" ret=%d" -vfio_spapr_create_window(int ps, uint64_t ws, uint64_t off) "pageshift=0x%x winsize=0x%"PRIx64" offset=0x%"PRIx64 +vfio_spapr_create_window(int ps, unsigned int levels, uint64_t ws, uint64_t off) "pageshift=0x%x levels=%u winsize=0x%"PRIx64" offset=0x%"PRIx64 vfio_spapr_remove_window(uint64_t off) "offset=0x%"PRIx64 vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd %d" + + # hw/vfio/display.c + vfio_display_edid_available(void) "" + vfio_display_edid_link_up(void) "" + vfio_display_edid_link_down(void) "" + vfio_display_edid_update(uint32_t prefx, uint32_t prefy) "%ux%u" + vfio_display_edid_write_error(void) ""