diff --git a/hw/vga-pci.c b/hw/vga-pci.c index 6038cec00db79292469e92f9d2653133a7c48a87..ccc78e5b8a6dd9c7aedd5dd8459fde1208d10e6d 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 514371c39b1a66407a95ec1bf3caa6a64271766a..6cbd3d3a5213d94a50b4954ed148ad4583064869 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 */