From mboxrd@z Thu Jan 1 00:00:00 1970 From: Glauber Costa Subject: [PATCH 9/9] remove explicit calls to kvm_qemu_register_coalesced_mmio Date: Fri, 12 Sep 2008 12:10:50 -0300 Message-ID: <1221232250-9653-10-git-send-email-glommer@redhat.com> References: <1221232250-9653-1-git-send-email-glommer@redhat.com> Cc: jes@sgi.com, avi@qumranet.com, aliguori@us.ibm.com To: kvm@vger.kernel.org Return-path: Received: from mx2.redhat.com ([66.187.237.31]:51419 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753119AbYILPTc (ORCPT ); Fri, 12 Sep 2008 11:19:32 -0400 In-Reply-To: <1221232250-9653-1-git-send-email-glommer@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: It is now done automatically for IO regions inside kvm_cpu_register_physical_memory(). --- qemu/hw/cirrus_vga.c | 2 -- qemu/hw/e1000.c | 12 ------------ qemu/hw/pci.c | 3 --- qemu/hw/vga.c | 4 ---- 4 files changed, 0 insertions(+), 21 deletions(-) diff --git a/qemu/hw/cirrus_vga.c b/qemu/hw/cirrus_vga.c index 0cf5b24..5919732 100644 --- a/qemu/hw/cirrus_vga.c +++ b/qemu/hw/cirrus_vga.c @@ -3291,8 +3291,6 @@ static void cirrus_init_common(CirrusVGAState * s, int device_id, int is_pci) cirrus_vga_mem_write, s); cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000, vga_io_memory); - if (kvm_enabled()) - qemu_kvm_register_coalesced_mmio(isa_mem_base + 0x000a0000, 0x20000); s->sr[0x06] = 0x0f; if (device_id == CIRRUS_ID_CLGD5446) { diff --git a/qemu/hw/e1000.c b/qemu/hw/e1000.c index 5ae3960..2d97b34 100644 --- a/qemu/hw/e1000.c +++ b/qemu/hw/e1000.c @@ -942,18 +942,6 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num, d->mmio_base = addr; cpu_register_physical_memory(addr, PNPMMIO_SIZE, d->mmio_index); - - if (kvm_enabled()) { - int i; - uint32_t excluded_regs[] = { - E1000_MDIC, E1000_ICR, E1000_ICS, E1000_IMS, - E1000_IMC, E1000_TCTL, E1000_TDT, PNPMMIO_SIZE - }; - qemu_kvm_register_coalesced_mmio(addr, excluded_regs[0]); - for (i = 0; excluded_regs[i] != PNPMMIO_SIZE; i++) - qemu_kvm_register_coalesced_mmio(addr + excluded_regs[i] + 4, - excluded_regs[i + 1] - excluded_regs[i] - 4); - } } static int diff --git a/qemu/hw/pci.c b/qemu/hw/pci.c index 07d37a8..2e4ec92 100644 --- a/qemu/hw/pci.c +++ b/qemu/hw/pci.c @@ -324,9 +324,6 @@ static void pci_update_mappings(PCIDevice *d) cpu_register_physical_memory(pci_to_cpu_addr(r->addr), r->size, IO_MEM_UNASSIGNED); - if (kvm_enabled()) - qemu_kvm_unregister_coalesced_mmio(r->addr, - r->size); } } r->addr = new_addr; diff --git a/qemu/hw/vga.c b/qemu/hw/vga.c index 3a5dcbc..ba0dec4 100644 --- a/qemu/hw/vga.c +++ b/qemu/hw/vga.c @@ -2259,8 +2259,6 @@ void vga_init(VGAState *s) vga_io_memory = cpu_register_io_memory(0, vga_mem_read, vga_mem_write, s); cpu_register_physical_memory(isa_mem_base + 0x000a0000, 0x20000, vga_io_memory); - if (kvm_enabled()) - qemu_kvm_register_coalesced_mmio(isa_mem_base + 0x000a0000, 0x20000); } /* Memory mapped interface */ @@ -2336,8 +2334,6 @@ static void vga_mm_init(VGAState *s, target_phys_addr_t vram_base, cpu_register_physical_memory(ctrl_base, 0x100000, s_ioport_ctrl); s->bank_offset = 0; cpu_register_physical_memory(vram_base + 0x000a0000, 0x20000, vga_io_memory); - if (kvm_enabled()) - qemu_kvm_register_coalesced_mmio(vram_base + 0x000a0000, 0x20000); } int isa_vga_init(DisplayState *ds, uint8_t *vga_ram_base, -- 1.5.5.1