qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org
Cc: kvm@vger.kernel.org, "Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PATCH v3 39/39] pci: remove support for pre memory API BARs
Date: Thu,  4 Aug 2011 16:06:35 +0300	[thread overview]
Message-ID: <1312463195-13605-40-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1312463195-13605-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

  parent reply	other threads:[~2011-08-04 13:06 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-04 13:05 [Qemu-devel] [PATCH v3 00/39] Memory API, batch 2: PCI devices Avi Kivity
2011-08-04 13:05 ` [Qemu-devel] [PATCH v3 01/39] virtio-pci: get config on init Avi Kivity
2011-08-05 13:52   ` Anthony Liguori
2011-08-07  8:20     ` Avi Kivity
2011-08-08 10:36     ` Michael S. Tsirkin
2011-08-08 12:45       ` Anthony Liguori
2011-08-08 12:48         ` Avi Kivity
2011-08-08 12:56         ` Michael S. Tsirkin
2011-08-08 13:02           ` Anthony Liguori
2011-08-08 13:14             ` Michael S. Tsirkin
2011-08-08 13:15               ` Anthony Liguori
2011-08-04 13:05 ` [Qemu-devel] [PATCH v3 02/39] pci: add API to get a BAR's mapped address Avi Kivity
2011-08-05 13:53   ` Anthony Liguori
2011-08-07  8:22     ` Avi Kivity
2011-08-04 13:05 ` [Qemu-devel] [PATCH v3 03/39] vmsvga: don't remember pci BAR address in callback any more Avi Kivity
2011-08-05 13:54   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 04/39] vga: convert vga and its derivatives to the memory API Avi Kivity
2011-08-05 14:02   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 05/39] cirrus: simplify mmio BAR access functions Avi Kivity
2011-08-05 14:04   ` Anthony Liguori
2011-08-05 14:08   ` Anthony Liguori
2011-08-07  8:25     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 06/39] cirrus: simplify bitblt " Avi Kivity
2011-08-05 14:09   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 07/39] cirrus: simplify vga window mmio " Avi Kivity
2011-08-05 14:09   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 08/39] vga: " Avi Kivity
2011-08-05 14:10   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 09/39] cirrus: simplify linear framebuffer " Avi Kivity
2011-08-05 14:11   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 10/39] Integrate I/O memory regions into qemu Avi Kivity
2011-08-05 14:15   ` Anthony Liguori
2011-08-07  8:27     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 11/39] pci: pass I/O address space to new PCI bus Avi Kivity
2011-08-05 14:16   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 12/39] pci: allow I/O BARs to be registered with pci_register_bar_region() Avi Kivity
2011-08-05 14:19   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 13/39] rtl8139: convert to memory API Avi Kivity
2011-08-05 14:21   ` Anthony Liguori
2011-08-07  8:56     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 14/39] ac97: " Avi Kivity
2011-08-05 14:23   ` Anthony Liguori
2011-08-05 16:47     ` malc
2011-08-07  8:30       ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 15/39] e1000: " Avi Kivity
2011-08-05 15:19   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 16/39] eepro100: " Avi Kivity
2011-08-05 15:20   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 17/39] es1370: " Avi Kivity
2011-08-05 15:21   ` Anthony Liguori
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 18/39] ide: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 19/39] ivshmem: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 20/39] virtio-pci: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 21/39] ahci: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 22/39] intel-hda: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 23/39] lsi53c895a: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 24/39] ppc: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 25/39] ne2000: " Avi Kivity
2011-08-05 15:28   ` Anthony Liguori
2011-08-07  9:21     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 26/39] pcnet: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 27/39] i6300esb: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 28/39] isa-mmio: concert " Avi Kivity
2011-08-05 15:29   ` Anthony Liguori
2011-08-07  9:21     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 29/39] sun4u: convert " Avi Kivity
2011-08-05 15:30   ` Anthony Liguori
2011-08-07  9:27     ` Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 30/39] ehci: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 31/39] uhci: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 32/39] xen-platform: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 33/39] msix: " Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 34/39] pci: remove pci_register_bar_simple() Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 35/39] pci: convert pci rom to memory API Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 36/39] pci: remove pci_register_bar() Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 37/39] pci: fold BAR mapping function into its caller Avi Kivity
2011-08-04 13:06 ` [Qemu-devel] [PATCH v3 38/39] pci: rename pci_register_bar_region() to pci_register_bar() Avi Kivity
2011-08-04 13:06 ` Avi Kivity [this message]
2011-08-05 15:34 ` [Qemu-devel] [PATCH v3 00/39] Memory API, batch 2: PCI devices Anthony Liguori

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=1312463195-13605-40-git-send-email-avi@redhat.com \
    --to=avi@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=kvm@vger.kernel.org \
    --cc=mst@redhat.com \
    --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).