[PATCH] hw/display: load the correct ROM file for isa-vga device

[PATCH] hw/display: load the correct ROM file for isa-vga device

[Liav Albani]

Apparently we didn't load the correct ROM file when using the isa-vga
device, which resulted in a display waiting to be initialized by a guest
OS kernel. With this fix, SeaBIOS is able to print vital data to a text
mode console during boot, which is useful in case of failing to continue
booting.

Signed-off-by: Liav Albani <liavalb@gmail.com>
---
 hw/display/vga-isa.c | 2 +-
 hw/display/vga_int.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
index 46abbc5653..bcf646d012 100644
--- a/hw/display/vga-isa.c
+++ b/hw/display/vga-isa.c
@@ -84,7 +84,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
                                 VBE_DISPI_LFB_PHYSICAL_ADDRESS,
                                 &s->vram);
     /* ROM BIOS */
-    rom_add_vga(VGABIOS_FILENAME);
+    rom_add_vga(VGABIOS_ISAVGA_FILENAME);
 }
 
 static Property vga_isa_properties[] = {
diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
index 305e700014..b5e803ac51 100644
--- a/hw/display/vga_int.h
+++ b/hw/display/vga_int.h
@@ -183,7 +183,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val);
 extern const uint8_t sr_mask[8];
 extern const uint8_t gr_mask[16];
 
-#define VGABIOS_FILENAME "vgabios.bin"
+#define VGABIOS_ISAVGA_FILENAME "vgabios-isa.bin"
 #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
 
 extern const MemoryRegionOps vga_mem_ops;
-- 
2.37.3

Re: [PATCH] hw/display: load the correct ROM file for isa-vga device

[Liav Albani]

On 9/17/22 17:06, Liav Albani wrote:
> Apparently we didn't load the correct ROM file when using the isa-vga
> device, which resulted in a display waiting to be initialized by a guest
> OS kernel. With this fix, SeaBIOS is able to print vital data to a text
> mode console during boot, which is useful in case of failing to continue
> booting.
>
> Signed-off-by: Liav Albani <liavalb@gmail.com>
> ---
>   hw/display/vga-isa.c | 2 +-
>   hw/display/vga_int.h | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/display/vga-isa.c b/hw/display/vga-isa.c
> index 46abbc5653..bcf646d012 100644
> --- a/hw/display/vga-isa.c
> +++ b/hw/display/vga-isa.c
> @@ -84,7 +84,7 @@ static void vga_isa_realizefn(DeviceState *dev, Error **errp)
>                                   VBE_DISPI_LFB_PHYSICAL_ADDRESS,
>                                   &s->vram);
>       /* ROM BIOS */
> -    rom_add_vga(VGABIOS_FILENAME);
> +    rom_add_vga(VGABIOS_ISAVGA_FILENAME);
>   }
>   
>   static Property vga_isa_properties[] = {
> diff --git a/hw/display/vga_int.h b/hw/display/vga_int.h
> index 305e700014..b5e803ac51 100644
> --- a/hw/display/vga_int.h
> +++ b/hw/display/vga_int.h
> @@ -183,7 +183,7 @@ void vbe_ioport_write_data(void *opaque, uint32_t addr, uint32_t val);
>   extern const uint8_t sr_mask[8];
>   extern const uint8_t gr_mask[16];
>   
> -#define VGABIOS_FILENAME "vgabios.bin"
> +#define VGABIOS_ISAVGA_FILENAME "vgabios-isa.bin"
This should be an "vgabios-isavga.bin" actually, at least this is how it 
is named on my development machine. I'll send a v2 shortly.
>   #define VGABIOS_CIRRUS_FILENAME "vgabios-cirrus.bin"
>   
>   extern const MemoryRegionOps vga_mem_ops;