[Qemu-devel] Re: [PATCH 07/14] Code motion; make mm VGA init function more like standard vga init function. Add missing vga_reset hook to vga_mm_init.

[Jan Kiszka]

Zachary Amsden wrote:
> Signed-off-by: Zachary Amsden <address@hidden>
> ---
>  hw/vga.c |    9 ++++++---
>  1 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/hw/vga.c b/hw/vga.c
> index 33645a0..9b50959 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -2422,14 +2422,17 @@ static void vga_mm_init(VGAState *s, 
> target_phys_addr_t vram_base,
>  {
>      int s_ioport_ctrl, vga_io_memory;
>  
> +    qemu_register_reset(vga_reset, 0, s);

vga users like cirrus or vmware invoke reset too. You probably want to
drop those calls now. And did you check that vga_reset is still always
invoked before any vga user reset callback?

> +    register_savevm("vga", 0, 2, vga_save, vga_load, s);
> +
> +    s->bank_offset = 0;
> +
>      s->it_shift = it_shift;
>      s_ioport_ctrl = cpu_register_io_memory(vga_mm_read_ctrl, 
> vga_mm_write_ctrl, s);
> -    vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s);
>  
> -    register_savevm("vga", 0, 2, vga_save, vga_load, s);
> +    vga_io_memory = cpu_register_io_memory(vga_mem_read, vga_mem_write, s);
>  
>      cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl);
> -    s->bank_offset = 0;
>      cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, 
> vga_io_memory);
>      qemu_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000);
>  }

Jan

-- 
Siemens AG, Corporate Technology, CT SE 2
Corporate Competence Center Embedded Linux