Commit 19aaee2a authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ramfb: don't update RAMFBState on errors 



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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Message-id: 20200429115236.28709-5-kraxel@redhat.com
parent 46a298d6

hw/display/ramfb.c

+17 −9
Original line number Diff line number Diff line
@@ -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)

{

    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);

    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);



    s->ds = ramfb_create_display_surface(s->width, s->height,

    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)