mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ramfb: don't update RAMFBState on errors

Browse Source 
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 <kraxel@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 20200429115236.28709-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2020-04-29 13:52:34 +02:00
parent 46a298d602
commit 19aaee2a65
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/display/ramfb.c
View File

@ -71,18 +71,26 @@ static DisplaySurface *ramfb_create_display_surface(int width, int height,
static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len) static void ramfb_fw_cfg_write(void *dev, off_t offset, size_t len)
{ {
RAMFBState *s = dev; RAMFBState *s = dev;
uint32_t fourcc, format; DisplaySurface *surface;
uint32_t fourcc, format, width, height;
hwaddr stride, addr; hwaddr stride, addr;
s->width = be32_to_cpu(s->cfg.width); width = be32_to_cpu(s->cfg.width);
s->height = be32_to_cpu(s->cfg.height); height = be32_to_cpu(s->cfg.height);
stride = be32_to_cpu(s->cfg.stride); stride = be32_to_cpu(s->cfg.stride);
fourcc = be32_to_cpu(s->cfg.fourcc); fourcc = be32_to_cpu(s->cfg.fourcc);
addr = be64_to_cpu(s->cfg.addr); addr = be64_to_cpu(s->cfg.addr);
format = qemu_drm_format_to_pixman(fourcc); format = qemu_drm_format_to_pixman(fourcc);
s->ds = ramfb_create_display_surface(s->width, s->height, surface = ramfb_create_display_surface(width, height,
format, stride, addr); format, stride, addr);
if (!surface) {
return;
}
s->width = width;
s->height = height;
s->ds = surface;
} }
void ramfb_display_update(QemuConsole *con, RAMFBState *s) void ramfb_display_update(QemuConsole *con, RAMFBState *s)