Gerd Hoffmann <kra...@redhat.com> wrote:
> The bochs vbe interface got a new register a while back, which specifies
> the linear framebuffer size in 64k units. This patch adds support for
> the new register to qemu. With this patch applied vgabios 0.6c works
> with qemu.
>
> Signed-off-by: Gerd Hoffmann <kra...@redhat.com>
It breaks migration.
vga.c:525: if (s->vbe_index <= VBE_DISPI_INDEX_NB) {
vga.c:564: if (s->vbe_index <= VBE_DISPI_INDEX_NB) {
vga.c:2218: VMSTATE_UINT16_ARRAY(vbe_regs, VGACommonState,
VBE_DISPI_INDEX_NB),
vga_int.h:50:#define VBE_DISPI_INDEX_NB 0xa
vga_int.h:71: uint16_t vbe_regs[VBE_DISPI_INDEX_NB]; \
2218 is the interesting line. Can we freeze this patch until the
subsections stuff is done?
I hope to sent a proposal Friday? And can use this as guinea pig?
Later, Juan.
> ---
> hw/vga.c | 3 ++-
> hw/vga_int.h | 4 +++-
> 2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/hw/vga.c b/hw/vga.c
> index 6a1a059..a5c6997 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -1955,7 +1955,8 @@ void vga_common_reset(VGACommonState *s)
> #ifdef CONFIG_BOCHS_VBE
> s->vbe_index = 0;
> memset(s->vbe_regs, '\0', sizeof(s->vbe_regs));
> - s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID0;
> + s->vbe_regs[VBE_DISPI_INDEX_ID] = VBE_DISPI_ID5;
> + s->vbe_regs[VBE_DISPI_INDEX_VIDEO_MEMORY_64K] = s->vram_size / (64 *
> 1024);
> s->vbe_start_addr = 0;
> s->vbe_line_offset = 0;
> s->vbe_bank_mask = (s->vram_size >> 16) - 1;
> diff --git a/hw/vga_int.h b/hw/vga_int.h
> index 23a42ef..4b8fc74 100644
> --- a/hw/vga_int.h
> +++ b/hw/vga_int.h
> @@ -47,13 +47,15 @@
> #define VBE_DISPI_INDEX_VIRT_HEIGHT 0x7
> #define VBE_DISPI_INDEX_X_OFFSET 0x8
> #define VBE_DISPI_INDEX_Y_OFFSET 0x9
> -#define VBE_DISPI_INDEX_NB 0xa
> +#define VBE_DISPI_INDEX_VIDEO_MEMORY_64K 0xa
> +#define VBE_DISPI_INDEX_NB 0xb
>
> #define VBE_DISPI_ID0 0xB0C0
> #define VBE_DISPI_ID1 0xB0C1
> #define VBE_DISPI_ID2 0xB0C2
> #define VBE_DISPI_ID3 0xB0C3
> #define VBE_DISPI_ID4 0xB0C4
> +#define VBE_DISPI_ID5 0xB0C5
>
> #define VBE_DISPI_DISABLED 0x00
> #define VBE_DISPI_ENABLED 0x01
