diff options
| author | Gerd Hoffmann | 2020-04-29 13:52:31 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2020-05-18 15:42:34 +0200 |
| commit | 2fc979cb9d717161c1dfde69fa5fe495c1ab03e9 (patch) | |
| tree | f270df164485c257a8cebf240d5a75600cd7012c /hw/display/ramfb.c | |
| parent | hw/display: Include local 'framebuffer.h' (diff) | |
| download | qemu-2fc979cb9d717161c1dfde69fa5fe495c1ab03e9.tar.gz qemu-2fc979cb9d717161c1dfde69fa5fe495c1ab03e9.tar.xz qemu-2fc979cb9d717161c1dfde69fa5fe495c1ab03e9.zip | |
Revert "hw/display/ramfb: initialize fw-config space with xres/ yres"
This reverts commit f79081b4b71b72640bedd40a7cd76f864c8287f1.
Patch has broken byteorder handling: RAMFBCfg fields are in bigendian
byteorder, the reset function doesn't care so native byteorder is used
instead. Given this went unnoticed so far the feature is obviously
unused, so just revert the patch.
Cc: Hou Qiming <hqm03ster@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Message-id: 20200429115236.28709-2-kraxel@redhat.com
Diffstat (limited to 'hw/display/ramfb.c')
| -rw-r--r-- | hw/display/ramfb.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/hw/display/ramfb.c b/hw/display/ramfb.c index 7ba07c80f6..bd4746dc17 100644 --- a/hw/display/ramfb.c +++ b/hw/display/ramfb.c @@ -13,7 +13,6 @@ #include "qemu/osdep.h" #include "qapi/error.h" -#include "qemu/option.h" #include "hw/loader.h" #include "hw/display/ramfb.h" #include "ui/console.h" @@ -31,7 +30,6 @@ struct QEMU_PACKED RAMFBCfg { struct RAMFBState { DisplaySurface *ds; uint32_t width, height; - uint32_t starting_width, starting_height; struct RAMFBCfg cfg; bool locked; }; @@ -117,11 +115,9 @@ static void ramfb_reset(void *opaque) RAMFBState *s = (RAMFBState *)opaque; s->locked = false; memset(&s->cfg, 0, sizeof(s->cfg)); - s->cfg.width = s->starting_width; - s->cfg.height = s->starting_height; } -RAMFBState *ramfb_setup(DeviceState* dev, Error **errp) +RAMFBState *ramfb_setup(Error **errp) { FWCfgState *fw_cfg = fw_cfg_find(); RAMFBState *s; @@ -133,16 +129,6 @@ RAMFBState *ramfb_setup(DeviceState* dev, Error **errp) s = g_new0(RAMFBState, 1); - const char *s_fb_width = qemu_opt_get(dev->opts, "xres"); - const char *s_fb_height = qemu_opt_get(dev->opts, "yres"); - if (s_fb_width) { - s->cfg.width = atoi(s_fb_width); - s->starting_width = s->cfg.width; - } - if (s_fb_height) { - s->cfg.height = atoi(s_fb_height); - s->starting_height = s->cfg.height; - } s->locked = false; rom_add_vga("vgabios-ramfb.bin"); |