From: Peter Maydell Date: Mon, 15 Oct 2018 14:03:45 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' into... X-Git-Tag: qemu-xen-4.13.0-rc1~623 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ff56877e911782dedc9a424233fd3f62369c258c;p=qemu-xen.git Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181015-pull-request' into staging vga: config tweaks, edid updates, qxl bugfix, install new vgabios blobs. # gpg: Signature made Mon 15 Oct 2018 10:05:03 BST # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/vga-20181015-pull-request: Makefile: Install new vgabios binaries hw/display/cirrus_vga: Move "isa-cirrus-vga" device into a separate file i2c: switch ddc to use the new edid generator qxl: check qxl_phys2virt return value bochs-display: wire up edid support display: add separate config option for bochs-display edid: fix alignment issues Signed-off-by: Peter Maydell --- ff56877e911782dedc9a424233fd3f62369c258c