| Message ID | 7903f7619f8c158bd59eac34e8761fb00df7fd23.1308070416.git.jan.kiszka@siemens.com |
|---|---|
| State | New |
| Headers | show |
On 14 June 2011 18:53, Jan Kiszka <jan.kiszka@siemens.com> wrote: > This eliminates the last user of vga_dirty_log_start/start. > > CC: Andrzej Zaborowski <balrog@zabor.org> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Reviewed-by: Andrzej Zaborowski <balrogg@gmail.com> > --- > hw/vmware_vga.c | 12 +++++++----- > 1 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c > index c20f154..7cb0c28 100644 > --- a/hw/vmware_vga.c > +++ b/hw/vmware_vga.c > @@ -828,9 +828,13 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) > s->vga.invalidate(&s->vga); > if (s->enable) { > s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height; > - vga_dirty_log_stop(&s->vga); > - } else { > - vga_dirty_log_start(&s->vga); > + cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size, > + s->vga.vram_offset | IO_MEM_RAM, > + 0, false); > + } else if (s->vram_base) { > + cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size, > + s->vga.vram_offset | IO_MEM_RAM, > + 0, true); > } > break; > > @@ -1011,8 +1015,6 @@ static void vmsvga_reset(DeviceState *dev) > break; > } > s->syncing = 0; > - > - vga_dirty_log_start(&s->vga); > } > > static void vmsvga_invalidate_display(void *opaque) > -- > 1.7.1 > > >
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index c20f154..7cb0c28 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -828,9 +828,13 @@ static void vmsvga_value_write(void *opaque, uint32_t address, uint32_t value) s->vga.invalidate(&s->vga); if (s->enable) { s->fb_size = ((s->depth + 7) >> 3) * s->new_width * s->new_height; - vga_dirty_log_stop(&s->vga); - } else { - vga_dirty_log_start(&s->vga); + cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size, + s->vga.vram_offset | IO_MEM_RAM, + 0, false); + } else if (s->vram_base) { + cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size, + s->vga.vram_offset | IO_MEM_RAM, + 0, true); } break; @@ -1011,8 +1015,6 @@ static void vmsvga_reset(DeviceState *dev) break; } s->syncing = 0; - - vga_dirty_log_start(&s->vga); } static void vmsvga_invalidate_display(void *opaque)
This eliminates the last user of vga_dirty_log_start/start. CC: Andrzej Zaborowski <balrog@zabor.org> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> --- hw/vmware_vga.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-)