diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-24 12:09:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-24 12:09:23 +0100 |
| commit | 40575757e1ef9fa8e34c2320fb56a7dffd92efcc (patch) | |
| tree | 61c0f8af9a81637f914be3e38768a2b8d7e4113f /include | |
| parent | 636011255dec55da4cac28240ffcaa2e740f1e81 (diff) | |
| parent | f79081b4b71b72640bedd40a7cd76f864c8287f1 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190524-pull-request' into staging
ramfb: misc improvements.
# gpg: Signature made Fri 24 May 2019 09:56:59 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-20190524-pull-request:
hw/display/ramfb: initialize fw-config space with xres/ yres
hw/display/ramfb: lock guest resolution after it's set
hw/display/ramfb: fix guest memory un-mapping
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 b33a2c467b..f6c2de93b2 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(Error **errp); +RAMFBState *ramfb_setup(DeviceState *dev, Error **errp); /* ramfb-standalone.c */ #define TYPE_RAMFB_DEVICE "ramfb" |