diff options
| author | Peter Maydell | 2020-05-18 17:37:09 +0200 |
|---|---|---|
| committer | Peter Maydell | 2020-05-18 17:37:09 +0200 |
| commit | a28c9c8c9fc42484efe1bf5a77affe842e54e38b (patch) | |
| tree | f0975d07b7c1062416c7c8555c8c9cb1ad1d7ac2 /include | |
| parent | Merge remote-tracking branch 'remotes/rth/tags/pull-fpu-20200515' into staging (diff) | |
| parent | ramfb: fix size calculation (diff) | |
| download | qemu-a28c9c8c9fc42484efe1bf5a77affe842e54e38b.tar.gz qemu-a28c9c8c9fc42484efe1bf5a77affe842e54e38b.tar.xz qemu-a28c9c8c9fc42484efe1bf5a77affe842e54e38b.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20200518-pull-request' into staging
vga: ati-vga bugfix, ramfb cleanups and fixes.
# gpg: Signature made Mon 18 May 2020 16:12:11 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/vga-20200518-pull-request:
ramfb: fix size calculation
ramfb: add sanity checks to ramfb_create_display_surface
ramfb: don't update RAMFBState on errors
ramfb: drop leftover debug message
Revert "hw/display/ramfb: lock guest resolution after it's set"
Revert "hw/display/ramfb: initialize fw-config space with xres/ yres"
hw/display: Include local 'framebuffer.h'
ati-vga: Do not allow unaligned access via index register
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/display/ramfb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/display/ramfb.h b/include/hw/display/ramfb.h index f6c2de93b2..b33a2c467b 100644 --- a/include/hw/display/ramfb.h +++ b/include/hw/display/ramfb.h @@ -4,7 +4,7 @@ /* ramfb.c */ typedef struct RAMFBState RAMFBState; void ramfb_display_update(QemuConsole *con, RAMFBState *s); -RAMFBState *ramfb_setup(DeviceState *dev, Error **errp); +RAMFBState *ramfb_setup(Error **errp); /* ramfb-standalone.c */ #define TYPE_RAMFB_DEVICE "ramfb" |