[Qemu-devel] Re: [PATCH 2/2] vga: move back dirty_log functions to vga.c

[Jan Kiszka <jan.kiszka@siemens.com>]

Juan Quintela wrote:
> They are needed there on qemu-kvm.

Well, my real argument still is that they are not PCI-specific, even if
they are currently only used by PCI-based adapters.

Acked-by: Jan Kiszka <jan.kiszka@siemens.com>

Thanks,
Jan

> 
> Signed-off-by: Juan Quintela <quintela@redhat.com>
> ---
>  hw/vga-pci.c |   12 ------------
>  hw/vga.c     |   12 ++++++++++++
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/hw/vga-pci.c b/hw/vga-pci.c
> index 6038cec..ccc78e5 100644
> --- a/hw/vga-pci.c
> +++ b/hw/vga-pci.c
> @@ -28,7 +28,6 @@
>  #include "vga_int.h"
>  #include "pixel_ops.h"
>  #include "qemu-timer.h"
> -#include "kvm.h"
> 
>  typedef struct PCIVGAState {
>      PCIDevice dev;
> @@ -59,17 +58,6 @@ static int pci_vga_load(QEMUFile *f, void *opaque, int version_id)
>      return vga_common_load(f, &s->vga, version_id);
>  }
> 
> -void vga_dirty_log_start(VGACommonState *s)
> -{
> -    if (kvm_enabled() && s->map_addr)
> -        kvm_log_start(s->map_addr, s->map_end - s->map_addr);
> -
> -    if (kvm_enabled() && s->lfb_vram_mapped) {
> -        kvm_log_start(isa_mem_base + 0xa0000, 0x8000);
> -        kvm_log_start(isa_mem_base + 0xa8000, 0x8000);
> -    }
> -}
> -
>  static void vga_map(PCIDevice *pci_dev, int region_num,
>                      uint32_t addr, uint32_t size, int type)
>  {
> diff --git a/hw/vga.c b/hw/vga.c
> index 514371c..6cbd3d3 100644
> --- a/hw/vga.c
> +++ b/hw/vga.c
> @@ -28,6 +28,7 @@
>  #include "vga_int.h"
>  #include "pixel_ops.h"
>  #include "qemu-timer.h"
> +#include "kvm.h"
> 
>  //#define DEBUG_VGA
>  //#define DEBUG_VGA_MEM
> @@ -1576,6 +1577,17 @@ static void vga_sync_dirty_bitmap(VGACommonState *s)
>      }
>  }
> 
> +void vga_dirty_log_start(VGACommonState *s)
> +{
> +    if (kvm_enabled() && s->map_addr)
> +        kvm_log_start(s->map_addr, s->map_end - s->map_addr);
> +
> +    if (kvm_enabled() && s->lfb_vram_mapped) {
> +        kvm_log_start(isa_mem_base + 0xa0000, 0x8000);
> +        kvm_log_start(isa_mem_base + 0xa8000, 0x8000);
> +    }
> +}
> +
>  /*
>   * graphic modes
>   */

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