diff options
| author | Anthony Liguori | 2012-07-30 17:00:48 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2012-07-30 17:00:48 +0200 |
| commit | 5e3bc7144edd6e4fa2824944e5eb16c28197dd5a (patch) | |
| tree | e12e9145e74916485b482b2336bf1775a177e635 /hw/e1000.c | |
| parent | Merge remote-tracking branch 'bonzini/nbd-next' into staging (diff) | |
| parent | Merge branch pci into master (diff) | |
| download | qemu-5e3bc7144edd6e4fa2824944e5eb16c28197dd5a.tar.gz qemu-5e3bc7144edd6e4fa2824944e5eb16c28197dd5a.tar.xz qemu-5e3bc7144edd6e4fa2824944e5eb16c28197dd5a.zip | |
Merge remote-tracking branch 'mst/tags/for_anthony' into staging
* mst/tags/for_anthony:
msi/msix: added API to set MSI message address and data
pci: Add INTx routing notifier
pci: Add pci_device_route_intx_to_irq
pci: Unregister BARs before device exit
pci: convert PCIUnregisterFunc to void
msix: Switch msix_uninit to return void
msix: Allow full specification of MSIX layout
msix: Split PBA into it's own MemoryRegion
msix: Note endian TODO item
msix: Move msix_mmio_read
virtio: Convert to msix_init_exclusive_bar() interface
ivshmem: Convert to msix_init_exclusive_bar() interface
msix: Add simple BAR allocation MSIX setup functions
msix: fix PCIDevice naming inconsistency
msix: drop unused msix_bar_size, require valid bar_size
Diffstat (limited to 'hw/e1000.c')
| -rw-r--r-- | hw/e1000.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/e1000.c b/hw/e1000.c index ad242981cc..13a459c0eb 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -1192,7 +1192,7 @@ e1000_cleanup(VLANClientState *nc) s->nic = NULL; } -static int +static void pci_e1000_uninit(PCIDevice *dev) { E1000State *d = DO_UPCAST(E1000State, dev, dev); @@ -1202,7 +1202,6 @@ pci_e1000_uninit(PCIDevice *dev) memory_region_destroy(&d->mmio); memory_region_destroy(&d->io); qemu_del_vlan_client(&d->nic->nc); - return 0; } static NetClientInfo net_e1000_info = { |