diff mbox

[06/13] vmware-vga: Eliminate vga_dirty_log_restart

Message ID 31d82fef8ae4c0a9d8d50bd4d62f45e8250a0ed9.1308070416.git.jan.kiszka@siemens.com
State New
Headers show

Commit Message

Jan Kiszka June 14, 2011, 4:53 p.m. UTC
Convert the last user of vga_dirty_log_restart to
cpu_register_physical_memory_log and drop the service.

CC: Andrzej Zaborowski <balrog@zabor.org>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 hw/vga.c        |    6 ------
 hw/vga_int.h    |    1 -
 hw/vmware_vga.c |    5 ++---
 3 files changed, 2 insertions(+), 10 deletions(-)

Comments

andrzej zaborowski June 15, 2011, 11:48 p.m. UTC | #1
On 14 June 2011 18:53, Jan Kiszka <jan.kiszka@siemens.com> wrote:
> Convert the last user of vga_dirty_log_restart to
> cpu_register_physical_memory_log and drop the service.
>
> CC: Andrzej Zaborowski <balrog@zabor.org>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Andrzej Zaborowski <balrogg@gmail.com>
> ---
>  hw/vga.c        |    6 ------
>  hw/vga_int.h    |    1 -
>  hw/vmware_vga.c |    5 ++---
>  3 files changed, 2 insertions(+), 10 deletions(-)
>
> diff --git a/hw/vga.c b/hw/vga.c
> index 124295a..814d0d3 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -1606,12 +1606,6 @@ void vga_dirty_log_stop(VGACommonState *s)
>  #endif
>  }
>
> -void vga_dirty_log_restart(VGACommonState *s)
> -{
> -    vga_dirty_log_stop(s);
> -    vga_dirty_log_start(s);
> -}
> -
>  /*
>  * graphic modes
>  */
> diff --git a/hw/vga_int.h b/hw/vga_int.h
> index d2811bd..5cd9a6e 100644
> --- a/hw/vga_int.h
> +++ b/hw/vga_int.h
> @@ -196,7 +196,6 @@ void vga_common_reset(VGACommonState *s);
>
>  void vga_dirty_log_start(VGACommonState *s);
>  void vga_dirty_log_stop(VGACommonState *s);
> -void vga_dirty_log_restart(VGACommonState *s);
>
>  extern const VMStateDescription vmstate_vga_common;
>  uint32_t vga_ioport_read(void *opaque, uint32_t addr);
> diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
> index 1dfa875..82e2a1c 100644
> --- a/hw/vmware_vga.c
> +++ b/hw/vmware_vga.c
> @@ -1148,12 +1148,11 @@ static void pci_vmsvga_map_mem(PCIDevice *pci_dev, int region_num,
>     struct vmsvga_state_s *s = &d->chip;
>
>     s->vram_base = addr;
> -    cpu_register_physical_memory(s->vram_base, s->vga.vram_size,
> -                                 s->vga.vram_offset | IO_MEM_RAM);
> +    cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size,
> +                                     s->vga.vram_offset | IO_MEM_RAM, 0, true);
>
>     s->vga.map_addr = addr;
>     s->vga.map_end = addr + s->vga.vram_size;
> -    vga_dirty_log_restart(&s->vga);
>  }
>
>  static void pci_vmsvga_map_fifo(PCIDevice *pci_dev, int region_num,
> --
> 1.7.1
>
>
>
diff mbox

Patch

diff --git a/hw/vga.c b/hw/vga.c
index 124295a..814d0d3 100644
--- a/hw/vga.c
+++ b/hw/vga.c
@@ -1606,12 +1606,6 @@  void vga_dirty_log_stop(VGACommonState *s)
 #endif
 }
 
-void vga_dirty_log_restart(VGACommonState *s)
-{
-    vga_dirty_log_stop(s);
-    vga_dirty_log_start(s);
-}
-
 /*
  * graphic modes
  */
diff --git a/hw/vga_int.h b/hw/vga_int.h
index d2811bd..5cd9a6e 100644
--- a/hw/vga_int.h
+++ b/hw/vga_int.h
@@ -196,7 +196,6 @@  void vga_common_reset(VGACommonState *s);
 
 void vga_dirty_log_start(VGACommonState *s);
 void vga_dirty_log_stop(VGACommonState *s);
-void vga_dirty_log_restart(VGACommonState *s);
 
 extern const VMStateDescription vmstate_vga_common;
 uint32_t vga_ioport_read(void *opaque, uint32_t addr);
diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index 1dfa875..82e2a1c 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -1148,12 +1148,11 @@  static void pci_vmsvga_map_mem(PCIDevice *pci_dev, int region_num,
     struct vmsvga_state_s *s = &d->chip;
 
     s->vram_base = addr;
-    cpu_register_physical_memory(s->vram_base, s->vga.vram_size,
-                                 s->vga.vram_offset | IO_MEM_RAM);
+    cpu_register_physical_memory_log(s->vram_base, s->vga.vram_size,
+                                     s->vga.vram_offset | IO_MEM_RAM, 0, true);
 
     s->vga.map_addr = addr;
     s->vga.map_end = addr + s->vga.vram_size;
-    vga_dirty_log_restart(&s->vga);
 }
 
 static void pci_vmsvga_map_fifo(PCIDevice *pci_dev, int region_num,