[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [6603] qemu: add pci_unregister_device (Marcelo Tosatti)
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [6603] qemu: add pci_unregister_device (Marcelo Tosatti) |
Date: |
Wed, 11 Feb 2009 15:21:11 +0000 |
Revision: 6603
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6603
Author: aliguori
Date: 2009-02-11 15:21:10 +0000 (Wed, 11 Feb 2009)
Log Message:
-----------
qemu: add pci_unregister_device (Marcelo Tosatti)
Unregister the pci device, unassign its IO and memory regions, and free
associated data.
Add a callback so drivers can free device state.
Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Anthony Liguori <address@hidden>
Modified Paths:
--------------
trunk/hw/pci.c
trunk/hw/pci.h
Modified: trunk/hw/pci.c
===================================================================
--- trunk/hw/pci.c 2009-02-11 15:21:04 UTC (rev 6602)
+++ trunk/hw/pci.c 2009-02-11 15:21:10 UTC (rev 6603)
@@ -196,6 +196,48 @@
return pci_dev;
}
+static target_phys_addr_t pci_to_cpu_addr(target_phys_addr_t addr)
+{
+ return addr + pci_mem_base;
+}
+
+static void pci_unregister_io_regions(PCIDevice *pci_dev)
+{
+ PCIIORegion *r;
+ int i;
+
+ for(i = 0; i < PCI_NUM_REGIONS; i++) {
+ r = &pci_dev->io_regions[i];
+ if (!r->size || r->addr == -1)
+ continue;
+ if (r->type == PCI_ADDRESS_SPACE_IO) {
+ isa_unassign_ioport(r->addr, r->size);
+ } else {
+ cpu_register_physical_memory(pci_to_cpu_addr(r->addr),
+ r->size,
+ IO_MEM_UNASSIGNED);
+ }
+ }
+}
+
+int pci_unregister_device(PCIDevice *pci_dev)
+{
+ int ret = 0;
+
+ if (pci_dev->unregister)
+ ret = pci_dev->unregister(pci_dev);
+ if (ret)
+ return ret;
+
+ pci_unregister_io_regions(pci_dev);
+
+ qemu_free_irqs(pci_dev->irq);
+ pci_irq_index--;
+ pci_dev->bus->devices[pci_dev->devfn] = NULL;
+ qemu_free(pci_dev);
+ return 0;
+}
+
void pci_register_io_region(PCIDevice *pci_dev, int region_num,
uint32_t size, int type,
PCIMapIORegionFunc *map_func)
@@ -218,11 +260,6 @@
*(uint32_t *)(pci_dev->config + addr) = cpu_to_le32(type);
}
-static target_phys_addr_t pci_to_cpu_addr(target_phys_addr_t addr)
-{
- return addr + pci_mem_base;
-}
-
static void pci_update_mappings(PCIDevice *d)
{
PCIIORegion *r;
Modified: trunk/hw/pci.h
===================================================================
--- trunk/hw/pci.h 2009-02-11 15:21:04 UTC (rev 6602)
+++ trunk/hw/pci.h 2009-02-11 15:21:10 UTC (rev 6603)
@@ -125,6 +125,7 @@
uint32_t address, int len);
typedef void PCIMapIORegionFunc(PCIDevice *pci_dev, int region_num,
uint32_t addr, uint32_t size, int type);
+typedef int PCIUnregisterFunc(PCIDevice *pci_dev);
#define PCI_ADDRESS_SPACE_MEM 0x00
#define PCI_ADDRESS_SPACE_IO 0x01
@@ -189,6 +190,7 @@
/* do not access the following fields */
PCIConfigReadFunc *config_read;
PCIConfigWriteFunc *config_write;
+ PCIUnregisterFunc *unregister;
/* ??? This is a PC-specific hack, and should be removed. */
int irq_index;
@@ -203,6 +205,7 @@
int instance_size, int devfn,
PCIConfigReadFunc *config_read,
PCIConfigWriteFunc *config_write);
+int pci_unregister_device(PCIDevice *pci_dev);
void pci_register_io_region(PCIDevice *pci_dev, int region_num,
uint32_t size, int type,
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [6603] qemu: add pci_unregister_device (Marcelo Tosatti),
Anthony Liguori <=