[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT 50af324] vga: move back dirty_log functions to vg
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT 50af324] vga: move back dirty_log functions to vga.c |
Date: |
Mon, 05 Oct 2009 14:52:45 -0000 |
From: Juan Quintela <address@hidden>
They are needed there on qemu-kvm.
Signed-off-by: Juan Quintela <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
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
*/
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT 50af324] vga: move back dirty_log functions to vga.c,
Anthony Liguori <=