pci: move unregister from PCIDevice to PCIDeviceInfo

One more cleanup while being at it ;)

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Gerd Hoffmann 2009-09-25 21:42:38 +02:00 committed by Anthony Liguori
parent a36a344dcd
commit e3936fa574
8 changed files with 13 additions and 11 deletions

View File

@ -1129,7 +1129,6 @@ static int pci_e1000_init(PCIDevice *pci_dev)
qemu_format_nic_info_str(d->vc, macaddr); qemu_format_nic_info_str(d->vc, macaddr);
register_savevm(info_str, -1, 2, nic_save, nic_load, d); register_savevm(info_str, -1, 2, nic_save, nic_load, d);
d->dev.unregister = pci_e1000_uninit;
qemu_register_reset(e1000_reset, d); qemu_register_reset(e1000_reset, d);
e1000_reset(d); e1000_reset(d);
return 0; return 0;
@ -1139,6 +1138,7 @@ static PCIDeviceInfo e1000_info = {
.qdev.name = "e1000", .qdev.name = "e1000",
.qdev.size = sizeof(E1000State), .qdev.size = sizeof(E1000State),
.init = pci_e1000_init, .init = pci_e1000_init,
.exit = pci_e1000_uninit,
}; };
static void e1000_register_devices(void) static void e1000_register_devices(void)

View File

@ -1778,8 +1778,6 @@ static int nic_init(PCIDevice *pci_dev, uint32_t device)
TRACE(OTHER, logout("\n")); TRACE(OTHER, logout("\n"));
s->dev.unregister = pci_nic_uninit;
s->device = device; s->device = device;
pci_reset(s); pci_reset(s);
@ -1888,6 +1886,7 @@ static PCIDeviceInfo eepro100_info[] = {
.qdev.name = "i82551", .qdev.name = "i82551",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),
.init = pci_i82551_init, .init = pci_i82551_init,
.exit = pci_nic_uninit,
},{ },{
.qdev.name = "i82557a", .qdev.name = "i82557a",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),
@ -1896,6 +1895,7 @@ static PCIDeviceInfo eepro100_info[] = {
.qdev.name = "i82557b", .qdev.name = "i82557b",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),
.init = pci_i82557b_init, .init = pci_i82557b_init,
.exit = pci_nic_uninit,
},{ },{
.qdev.name = "i82557c", .qdev.name = "i82557c",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),
@ -1924,6 +1924,7 @@ static PCIDeviceInfo eepro100_info[] = {
.qdev.name = "i82559er", .qdev.name = "i82559er",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),
.init = pci_i82559er_init, .init = pci_i82559er_init,
.exit = pci_nic_uninit,
},{ },{
.qdev.name = "i82562", .qdev.name = "i82562",
.qdev.size = sizeof(EEPRO100State), .qdev.size = sizeof(EEPRO100State),

View File

@ -2174,7 +2174,6 @@ static int lsi_scsi_init(PCIDevice *dev)
s->queue = qemu_malloc(sizeof(lsi_queue)); s->queue = qemu_malloc(sizeof(lsi_queue));
s->queue_len = 1; s->queue_len = 1;
s->active_commands = 0; s->active_commands = 0;
s->dev.unregister = lsi_scsi_uninit;
lsi_soft_reset(s); lsi_soft_reset(s);
@ -2189,6 +2188,7 @@ static PCIDeviceInfo lsi_info = {
.qdev.alias = "lsi", .qdev.alias = "lsi",
.qdev.size = sizeof(LSIState), .qdev.size = sizeof(LSIState),
.init = lsi_scsi_init, .init = lsi_scsi_init,
.exit = lsi_scsi_uninit,
}; };
static void lsi53c895a_register_devices(void) static void lsi53c895a_register_devices(void)

View File

@ -26,6 +26,7 @@
#include "monitor.h" #include "monitor.h"
#include "net.h" #include "net.h"
#include "sysemu.h" #include "sysemu.h"
#include "msix.h"
//#define DEBUG_PCI //#define DEBUG_PCI
#ifdef DEBUG_PCI #ifdef DEBUG_PCI
@ -402,13 +403,15 @@ static void pci_unregister_io_regions(PCIDevice *pci_dev)
static int pci_unregister_device(DeviceState *dev) static int pci_unregister_device(DeviceState *dev)
{ {
PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev); PCIDevice *pci_dev = DO_UPCAST(PCIDevice, qdev, dev);
PCIDeviceInfo *info = DO_UPCAST(PCIDeviceInfo, qdev, dev->info);
int ret = 0; int ret = 0;
if (pci_dev->unregister) if (info->exit)
ret = pci_dev->unregister(pci_dev); ret = info->exit(pci_dev);
if (ret) if (ret)
return ret; return ret;
msix_uninit(pci_dev);
pci_unregister_io_regions(pci_dev); pci_unregister_io_regions(pci_dev);
qemu_free_irqs(pci_dev->irq); qemu_free_irqs(pci_dev->irq);

View File

@ -330,6 +330,7 @@ typedef int (*pci_qdev_initfn)(PCIDevice *dev);
typedef struct { typedef struct {
DeviceInfo qdev; DeviceInfo qdev;
pci_qdev_initfn init; pci_qdev_initfn init;
PCIUnregisterFunc *exit;
PCIConfigReadFunc *config_read; PCIConfigReadFunc *config_read;
PCIConfigWriteFunc *config_write; PCIConfigWriteFunc *config_write;
} PCIDeviceInfo; } PCIDeviceInfo;

View File

@ -2039,8 +2039,6 @@ static int pci_pcnet_init(PCIDevice *pci_dev)
sizeof(struct pcnet_RMD), sizeof(struct pcnet_TMD)); sizeof(struct pcnet_RMD), sizeof(struct pcnet_TMD));
#endif #endif
pci_dev->unregister = pci_pcnet_uninit;
pci_conf = pci_dev->config; pci_conf = pci_dev->config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_AMD); pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_AMD);
@ -2170,6 +2168,7 @@ static PCIDeviceInfo pcnet_info = {
.qdev.name = "pcnet", .qdev.name = "pcnet",
.qdev.size = sizeof(PCIPCNetState), .qdev.size = sizeof(PCIPCNetState),
.init = pci_pcnet_init, .init = pci_pcnet_init,
.exit = pci_pcnet_uninit,
}; };
static void pcnet_register_devices(void) static void pcnet_register_devices(void)

View File

@ -3443,8 +3443,6 @@ static int pci_rtl8139_init(PCIDevice *dev)
RTL8139State * s = DO_UPCAST(RTL8139State, dev, dev); RTL8139State * s = DO_UPCAST(RTL8139State, dev, dev);
uint8_t *pci_conf; uint8_t *pci_conf;
s->dev.unregister = pci_rtl8139_uninit;
pci_conf = s->dev.config; pci_conf = s->dev.config;
pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK); pci_config_set_vendor_id(pci_conf, PCI_VENDOR_ID_REALTEK);
pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139); pci_config_set_device_id(pci_conf, PCI_DEVICE_ID_REALTEK_8139);
@ -3493,6 +3491,7 @@ static PCIDeviceInfo rtl8139_info = {
.qdev.size = sizeof(RTL8139State), .qdev.size = sizeof(RTL8139State),
.qdev.reset = rtl8139_reset, .qdev.reset = rtl8139_reset,
.init = pci_rtl8139_init, .init = pci_rtl8139_init,
.exit = pci_rtl8139_uninit,
}; };
static void rtl8139_register_devices(void) static void rtl8139_register_devices(void)

View File

@ -417,7 +417,6 @@ static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,
msix_bar_size(&proxy->pci_dev), msix_bar_size(&proxy->pci_dev),
PCI_ADDRESS_SPACE_MEM, PCI_ADDRESS_SPACE_MEM,
msix_mmio_map); msix_mmio_map);
proxy->pci_dev.unregister = msix_uninit;
} else } else
vdev->nvectors = 0; vdev->nvectors = 0;