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>
This commit is contained in:
		
							parent
							
								
									f22f5b077c
								
							
						
					
					
						commit
						50af324697
					
				
							
								
								
									
										12
									
								
								hw/vga-pci.c
								
								
								
								
							
							
						
						
									
										12
									
								
								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)
 | 
			
		||||
{
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										12
									
								
								hw/vga.c
								
								
								
								
							
							
						
						
									
										12
									
								
								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
 | 
			
		||||
 */
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue