From: Avi Kivity <avi@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org
Subject: [Qemu-devel] [PATCH v2 38/38] pci: remove support for pre memory API BARs
Date: Wed, 3 Aug 2011 14:56:08 +0300 [thread overview]
Message-ID: <1312372568-5215-39-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1312372568-5215-1-git-send-email-avi@redhat.com>
Not used anymore.
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Avi Kivity <avi@redhat.com>
---
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
prev parent reply other threads:[~2011-08-03 11:56 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-03 11:55 [Qemu-devel] [PATCH v2 00/38] Memory API, batch 2: PCI devices Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 01/38] pci: add API to get a BAR's mapped address Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 02/38] vmsvga: don't remember pci BAR address in callback any more Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 03/38] vga: convert vga and its derivatives to the memory API Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 04/38] cirrus: simplify mmio BAR access functions Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 05/38] cirrus: simplify bitblt " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 06/38] cirrus: simplify vga window mmio " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 07/38] vga: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 08/38] cirrus: simplify linear framebuffer " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 09/38] Integrate I/O memory regions into qemu Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 10/38] pci: pass I/O address space to new PCI bus Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 11/38] pci: allow I/O BARs to be registered with pci_register_bar_region() Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 12/38] rtl8139: convert to memory API Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 13/38] ac97: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 14/38] e1000: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 15/38] eepro100: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 16/38] es1370: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 17/38] ide: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 18/38] ivshmem: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 19/38] virtio-pci: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 20/38] ahci: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 21/38] intel-hda: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 22/38] lsi53c895a: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 23/38] ppc: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 24/38] ne2000: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 25/38] pcnet: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 26/38] i6300esb: " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 27/38] isa-mmio: concert " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 28/38] sun4u: convert " Avi Kivity
2011-08-03 11:55 ` [Qemu-devel] [PATCH v2 29/38] ehci: " Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 30/38] uhci: " Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 31/38] xen-platform: " Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 32/38] msix: " Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 33/38] pci: remove pci_register_bar_simple() Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 34/38] pci: convert pci rom to memory API Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 35/38] pci: remove pci_register_bar() Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 36/38] pci: fold BAR mapping function into its caller Avi Kivity
2011-08-03 11:56 ` [Qemu-devel] [PATCH v2 37/38] pci: rename pci_register_bar_region() to pci_register_bar() Avi Kivity
2011-08-03 11:56 ` Avi Kivity [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1312372568-5215-39-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=kvm@vger.kernel.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).