[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] ramfb: don't update RAMFBState on errors
From: |
Gerd Hoffmann |
Subject: |
[PATCH 3/5] ramfb: don't update RAMFBState on errors |
Date: |
Wed, 22 Apr 2020 12:02:09 +0200 |
Store width & height & surface in local variables. Update RAMFBState
with the new values only in case the ramfb_create_display_surface() call
succeeds.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/display/ramfb.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c
index 9d41c2ad2868..fbe959147dc9 100644
--- a/hw/display/ramfb.c
+++ b/hw/display/ramfb.c
@@ -71,20 +71,27 @@ static DisplaySurface *ramfb_create_display_surface(int
width, int height,
static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len)
{
RAMFBState *s = dev;
- uint32_t fourcc, format;
+ DisplaySurface *surface;
+ uint32_t fourcc, format, width, height;
hwaddr stride, addr;
- s->width = be32_to_cpu(s->cfg.width);
- s->height = be32_to_cpu(s->cfg.height);
- stride = be32_to_cpu(s->cfg.stride);
- fourcc = be32_to_cpu(s->cfg.fourcc);
- addr = be64_to_cpu(s->cfg.addr);
- format = qemu_drm_format_to_pixman(fourcc);
+ width = be32_to_cpu(s->cfg.width);
+ height = be32_to_cpu(s->cfg.height);
+ stride = be32_to_cpu(s->cfg.stride);
+ fourcc = be32_to_cpu(s->cfg.fourcc);
+ addr = be64_to_cpu(s->cfg.addr);
+ format = qemu_drm_format_to_pixman(fourcc);
fprintf(stderr, "%s: %dx%d @ 0x%" PRIx64 "\n", __func__,
s->width, s->height, addr);
- s->ds = ramfb_create_display_surface(s->width, s->height,
- format, stride, addr);
+ surface = ramfb_create_display_surface(width, height,
+ format, stride, addr);
+ if (!surface)
+ return;
+
+ s->width = width;
+ s->height = height;
+ s->ds = surface;
}
void ramfb_display_update(QemuConsole *con, RAMFBState *s)
--
2.18.2
- [PATCH 0/5] ramfb: a bunch of reverts and fixes, Gerd Hoffmann, 2020/04/22
- [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Gerd Hoffmann, 2020/04/22
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Laszlo Ersek, 2020/04/22
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Gerd Hoffmann, 2020/04/23
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Laszlo Ersek, 2020/04/24
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Gerd Hoffmann, 2020/04/27
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Laszlo Ersek, 2020/04/28
- Re: [PATCH 4/5] ramfb: add sanity checks to ramfb_create_display_surface, Gerd Hoffmann, 2020/04/29
[PATCH 3/5] ramfb: don't update RAMFBState on errors,
Gerd Hoffmann <=
[PATCH 2/5] Revert "hw/display/ramfb: lock guest resolution after it's set", Gerd Hoffmann, 2020/04/22
[PATCH 1/5] Revert "hw/display/ramfb: initialize fw-config space with xres/ yres", Gerd Hoffmann, 2020/04/22
[PATCH 5/5] ramfb: drop leftover debug message, Gerd Hoffmann, 2020/04/22
Re: [PATCH 0/5] ramfb: a bunch of reverts and fixes, no-reply, 2020/04/22