diff options
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/cirrus_vga.c | 17 | ||||
| -rw-r--r-- | hw/vga.c | 17 | ||||
| -rw-r--r-- | hw/vga_int.h | 1 |
3 files changed, 0 insertions, 35 deletions
diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c index 2200ae03fa..114681e7de 100644 --- a/hw/cirrus_vga.c +++ b/hw/cirrus_vga.c @@ -2618,8 +2618,6 @@ static CPUWriteMemoryFunc *cirrus_linear_bitblt_write[3] = { static void map_linear_vram(CirrusVGAState *s) { - vga_dirty_log_stop((VGAState *)s); - if (!s->map_addr && s->lfb_addr && s->lfb_end) { s->map_addr = s->lfb_addr; s->map_end = s->lfb_end; @@ -2631,16 +2629,11 @@ static void map_linear_vram(CirrusVGAState *s) s->lfb_vram_mapped = 0; - cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000, - (s->vram_offset + s->cirrus_bank_base[0]) | IO_MEM_UNASSIGNED); - cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000, - (s->vram_offset + s->cirrus_bank_base[1]) | IO_MEM_UNASSIGNED); if (!(s->cirrus_srcptr != s->cirrus_srcptr_end) && !((s->sr[0x07] & 0x01) == 0) && !((s->gr[0x0B] & 0x14) == 0x14) && !(s->gr[0x0B] & 0x02)) { - vga_dirty_log_stop((VGAState *)s); cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000, (s->vram_offset + s->cirrus_bank_base[0]) | IO_MEM_RAM); cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000, @@ -2658,15 +2651,11 @@ static void map_linear_vram(CirrusVGAState *s) static void unmap_linear_vram(CirrusVGAState *s) { - vga_dirty_log_stop((VGAState *)s); - if (s->map_addr && s->lfb_addr && s->lfb_end) s->map_addr = s->map_end = 0; cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x20000, s->vga_io_memory); - - vga_dirty_log_start((VGAState *)s); } /* Compute the memory access functions */ @@ -3313,8 +3302,6 @@ static void cirrus_pci_lfb_map(PCIDevice *d, int region_num, { CirrusVGAState *s = &((PCICirrusVGAState *)d)->cirrus_vga; - vga_dirty_log_stop((VGAState *)s); - /* XXX: add byte swapping apertures */ cpu_register_physical_memory(addr, s->vram_size, s->cirrus_linear_io_addr); @@ -3346,14 +3333,10 @@ static void pci_cirrus_write_config(PCIDevice *d, PCICirrusVGAState *pvs = container_of(d, PCICirrusVGAState, dev); CirrusVGAState *s = &pvs->cirrus_vga; - vga_dirty_log_stop((VGAState *)s); - pci_default_write_config(d, address, val, len); if (s->map_addr && pvs->dev.io_regions[0].addr == -1) s->map_addr = 0; cirrus_update_memory_access(s); - - vga_dirty_log_start((VGAState *)s); } void pci_cirrus_vga_init(PCIBus *bus, int vga_ram_size) @@ -1279,8 +1279,6 @@ static void vga_draw_text(VGAState *s, int full_update) vga_draw_glyph8_func *vga_draw_glyph8; vga_draw_glyph9_func *vga_draw_glyph9; - vga_dirty_log_stop(s); - /* compute font data address (in plane 2) */ v = s->sr[3]; offset = (((v >> 4) & 1) | ((v << 1) & 6)) * 8192 * 4 + 2; @@ -1579,7 +1577,6 @@ static void vga_sync_dirty_bitmap(VGAState *s) cpu_physical_sync_dirty_bitmap(isa_mem_base + 0xa0000, 0xa8000); cpu_physical_sync_dirty_bitmap(isa_mem_base + 0xa8000, 0xb0000); } - vga_dirty_log_start(s); } /* @@ -1810,7 +1807,6 @@ static void vga_draw_blank(VGAState *s, int full_update) return; if (s->last_scr_width <= 0 || s->last_scr_height <= 0) return; - vga_dirty_log_stop(s); s->rgb_to_pixel = rgb_to_pixel_dup_table[get_depth_index(s->ds)]; @@ -2238,17 +2234,6 @@ void vga_dirty_log_start(VGAState *s) } } -void vga_dirty_log_stop(VGAState *s) -{ - if (kvm_enabled() && s->map_addr) - kvm_log_stop(s->map_addr, s->map_end - s->map_addr); - - if (kvm_enabled() && s->lfb_vram_mapped) { - kvm_log_stop(isa_mem_base + 0xa0000, 0x8000); - kvm_log_stop(isa_mem_base + 0xa8000, 0x8000); - } -} - static void vga_map(PCIDevice *pci_dev, int region_num, uint32_t addr, uint32_t size, int type) { @@ -2489,11 +2474,9 @@ static void pci_vga_write_config(PCIDevice *d, PCIVGAState *pvs = container_of(d, PCIVGAState, dev); VGAState *s = &pvs->vga_state; - vga_dirty_log_stop(s); pci_default_write_config(d, address, val, len); if (s->map_addr && pvs->dev.io_regions[0].addr == -1) s->map_addr = 0; - vga_dirty_log_start(s); } int pci_vga_init(PCIBus *bus, int vga_ram_size, diff --git a/hw/vga_int.h b/hw/vga_int.h index 5d66bd2496..1971aa6b51 100644 --- a/hw/vga_int.h +++ b/hw/vga_int.h @@ -196,7 +196,6 @@ void vga_init(VGAState *s); void vga_reset(void *s); void vga_dirty_log_start(VGAState *s); -void vga_dirty_log_stop(VGAState *s); uint32_t vga_mem_readb(void *opaque, target_phys_addr_t addr); void vga_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val); |