[PATCH 9/9] remove explicit calls to kvm_qemu_register_coalesced_mmio

Glauber Costa
2008-08-13T00:56:06Z

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 c7e8f2c..42bca4f 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 8d60ea6..ce3496b 100644
--- a/qemu/hw/e1000.c
+++ b/qemu/hw/e1000.c
@@ -951,18 +951,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 92683d1..f58c634 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 95d6033..17b5a36 100644
--- a/qemu/hw/vga.c
+++ b/qemu/hw/vga.c
@@ -2257,8 +2257,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 */
@@ -2334,8 +2332,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