From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH v2 38/38] pci: remove support for pre memory API BARs Date: Wed, 3 Aug 2011 14:56:08 +0300 Message-ID: <1312372568-5215-39-git-send-email-avi@redhat.com> References: <1312372568-5215-1-git-send-email-avi@redhat.com> Cc: kvm@vger.kernel.org To: Anthony Liguori , qemu-devel@nongnu.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:2360 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755267Ab1HCL4R (ORCPT ); Wed, 3 Aug 2011 07:56:17 -0400 In-Reply-To: <1312372568-5215-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Not used anymore. Reviewed-by: Richard Henderson Signed-off-by: Avi Kivity --- hw/pci.c | 33 ++------------------------------- 1 files changed, 2 insertions(+), 31 deletions(-) diff --git a/hw/pci.c b/hw/pci.c index 6ed08ae..e6a3e56 100644 --- a/hw/pci.c +++ b/hw/pci.c @@ -848,18 +848,7 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev) r = &pci_dev->io_regions[i]; if (!r->size || r->addr == PCI_BAR_UNMAPPED) continue; - if (r->memory) { - memory_region_del_subregion(r->address_space, r->memory); - } else { - if (r->type == PCI_BASE_ADDRESS_SPACE_IO) { - isa_unassign_ioport(r->addr, r->filtered_size); - } else { - cpu_register_physical_memory(pci_to_cpu_addr(pci_dev->bus, - r->addr), - r->filtered_size, - IO_MEM_UNASSIGNED); - } - } + memory_region_del_subregion(r->address_space, r->memory); } } @@ -1058,25 +1047,7 @@ static void pci_update_mappings(PCIDevice *d) /* now do the real mapping */ if (r->addr != PCI_BAR_UNMAPPED) { - if (r->memory) { - memory_region_del_subregion(r->address_space, r->memory); - } else if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { - int class; - /* NOTE: specific hack for IDE in PC case: - only one byte must be mapped. */ - class = pci_get_word(d->config + PCI_CLASS_DEVICE); - if (class == 0x0101 && r->size == 4) { - isa_unassign_ioport(r->addr + 2, 1); - } else { - isa_unassign_ioport(r->addr, r->filtered_size); - } - } else { - cpu_register_physical_memory(pci_to_cpu_addr(d->bus, - r->addr), - r->filtered_size, - IO_MEM_UNASSIGNED); - qemu_unregister_coalesced_mmio(r->addr, r->filtered_size); - } + memory_region_del_subregion(r->address_space, r->memory); } r->addr = new_addr; r->filtered_size = filtered_size; -- 1.7.5.3