Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 10:25:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vga: move back dirty_log functions to vga.c

Browse Source 
They are needed there on qemu-kvm.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Juan Quintela 2009-09-21 14:35:18 +02:00 committed by Anthony Liguori
parent f22f5b077c
commit 50af324697
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/vga-pci.c
View File

@ -28,7 +28,6 @@
#include "vga_int.h" #include "vga_int.h"
#include "pixel_ops.h" #include "pixel_ops.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "kvm.h"
typedef struct PCIVGAState { typedef struct PCIVGAState {
PCIDevice dev; 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); 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, static void vga_map(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type) uint32_t addr, uint32_t size, int type)
{ {

12
hw/vga.c
View File

@ -28,6 +28,7 @@
#include "vga_int.h" #include "vga_int.h"
#include "pixel_ops.h" #include "pixel_ops.h"
#include "qemu-timer.h" #include "qemu-timer.h"
#include "kvm.h"
//#define DEBUG_VGA //#define DEBUG_VGA
//#define DEBUG_VGA_MEM //#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 * graphic modes
*/ */