diff options
| author | Juan Quintela <quintela@redhat.com> | 2009-09-21 14:35:18 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-10-05 09:32:36 -0500 |
| commit | 50af324697cb91d3e7a820e2b94ee0237c0103e2 (patch) | |
| tree | be783ab8f24dffdb819b8491f69c4f0573045852 /hw | |
| parent | f22f5b077c164b864dae9776f63ed9e48a973fb6 (diff) | |
vga: move back dirty_log functions to vga.c
They are needed there on qemu-kvm.
Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/vga-pci.c | 12 | ||||
| -rw-r--r-- | 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) { @@ -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 */ |