From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LPhrC-0003OP-Uk for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:19 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LPhrC-0003No-1y for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:18 -0500 Received: from [199.232.76.173] (port=47369 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LPhrB-0003Nd-TD for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:17 -0500 Received: from savannah.gnu.org ([199.232.41.3]:44304 helo=sv.gnu.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LPhrB-0005K7-L9 for qemu-devel@nongnu.org; Wed, 21 Jan 2009 13:31:17 -0500 Received: from cvs.savannah.gnu.org ([199.232.41.69]) by sv.gnu.org with esmtp (Exim 4.63) (envelope-from ) id 1LPhrB-0003RY-4A for qemu-devel@nongnu.org; Wed, 21 Jan 2009 18:31:17 +0000 Received: from aliguori by cvs.savannah.gnu.org with local (Exim 4.63) (envelope-from ) id 1LPhrA-0003RU-Oq for qemu-devel@nongnu.org; Wed, 21 Jan 2009 18:31:16 +0000 MIME-Version: 1.0 Errors-To: aliguori Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Anthony Liguori Message-Id: Date: Wed, 21 Jan 2009 18:31:16 +0000 Subject: [Qemu-devel] [6383] cirrus: stop dirty logging during remaps (Jan Kiszka) Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Revision: 6383 http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6383 Author: aliguori Date: 2009-01-21 18:31:16 +0000 (Wed, 21 Jan 2009) Log Message: ----------- cirrus: stop dirty logging during remaps (Jan Kiszka) Cleaned-up port from kvm-userspace: We have to stop any vram logging while doing remaps. Otherwise the logger gets confused. This reward is enormously accelerated cirrus vga in kvm mode. Signed-off-by: Jan Kiszka Signed-off-by: Anthony Liguori Modified Paths: -------------- trunk/hw/cirrus_vga.c Modified: trunk/hw/cirrus_vga.c =================================================================== --- trunk/hw/cirrus_vga.c 2009-01-21 18:31:05 UTC (rev 6382) +++ trunk/hw/cirrus_vga.c 2009-01-21 18:31:16 UTC (rev 6383) @@ -2620,12 +2620,12 @@ 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; cpu_register_physical_memory(s->map_addr, s->map_end - s->map_addr, s->vram_offset); - vga_dirty_log_start((VGAState *)s); } if (!s->map_addr) @@ -2644,24 +2644,26 @@ (s->vram_offset + s->cirrus_bank_base[1]) | IO_MEM_RAM); s->lfb_vram_mapped = 1; - vga_dirty_log_start((VGAState *)s); } else { cpu_register_physical_memory(isa_mem_base + 0xa0000, 0x8000, s->vga_io_memory); cpu_register_physical_memory(isa_mem_base + 0xa8000, 0x8000, s->vga_io_memory); } + vga_dirty_log_start((VGAState *)s); } static void unmap_linear_vram(CirrusVGAState *s) { - if (s->map_addr && s->lfb_addr && s->lfb_end) { - vga_dirty_log_stop((VGAState *)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 */ @@ -3317,6 +3319,8 @@ { 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); @@ -3329,6 +3333,8 @@ /* account for overflow */ if (s->lfb_end < addr + VGA_RAM_SIZE) s->lfb_end = addr + VGA_RAM_SIZE; + + vga_dirty_log_start((VGAState *)s); } static void cirrus_pci_mmio_map(PCIDevice *d, int region_num, @@ -3340,6 +3346,22 @@ s->cirrus_mmio_io_addr); } +static void pci_cirrus_write_config(PCIDevice *d, + uint32_t address, uint32_t val, int len) +{ + 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, uint8_t *vga_ram_base, ram_addr_t vga_ram_offset, int vga_ram_size) { @@ -3353,7 +3375,7 @@ /* setup PCI configuration registers */ d = (PCICirrusVGAState *)pci_register_device(bus, "Cirrus VGA", sizeof(PCICirrusVGAState), - -1, NULL, NULL); + -1, NULL, pci_cirrus_write_config); pci_conf = d->dev.config; pci_conf[0x00] = (uint8_t) (PCI_VENDOR_CIRRUS & 0xff); pci_conf[0x01] = (uint8_t) (PCI_VENDOR_CIRRUS >> 8);