From 50af324697cb91d3e7a820e2b94ee0237c0103e2 Mon Sep 17 00:00:00 2001 From: Juan Quintela Date: Mon, 21 Sep 2009 14:35:18 +0200 Subject: [PATCH] vga: move back dirty_log functions to vga.c They are needed there on qemu-kvm. Signed-off-by: Juan Quintela Signed-off-by: Anthony Liguori --- 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 6038cec00d..ccc78e5b8a 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 514371c39b..6cbd3d3a52 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 */ -- 2.11.4.GIT