summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-11 15:21:22 +0000
committeraliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>2009-02-11 15:21:22 +0000
commit4b09be85a08c601cf2f25f799ab6f4c51c165e0a (patch)
tree57a91d69505ad13cd3908db2f259d3a4266bbec4 /hw/e1000.c
parentqemu: warn if PCI region is not power of two (Marcelo Tosatti) (diff)
downloadqemu-kvm-4b09be85a08c601cf2f25f799ab6f4c51c165e0a.tar.gz
qemu-kvm-4b09be85a08c601cf2f25f799ab6f4c51c165e0a.tar.bz2
qemu-kvm-4b09be85a08c601cf2f25f799ab6f4c51c165e0a.zip
qemu: LSI SCSI and e1000 unregister callbacks (Marcelo Tosatti)
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6605 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/e1000.c')
-rw-r--r--hw/e1000.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/hw/e1000.c b/hw/e1000.c
index 14c8297b3..e6155d6a6 100644
--- a/hw/e1000.c
+++ b/hw/e1000.c
@@ -1034,6 +1034,16 @@ e1000_mmio_map(PCIDevice *pci_dev, int region_num,
excluded_regs[i] - 4);
}
+static int
+pci_e1000_uninit(PCIDevice *dev)
+{
+ E1000State *d = (E1000State *) dev;
+
+ cpu_unregister_io_memory(d->mmio_index);
+
+ return 0;
+}
+
PCIDevice *
pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
{
@@ -1092,6 +1102,7 @@ pci_e1000_init(PCIBus *bus, NICInfo *nd, int devfn)
qemu_format_nic_info_str(d->vc, d->nd->macaddr);
register_savevm(info_str, -1, 2, nic_save, nic_load, d);
+ d->dev.unregister = pci_e1000_uninit;
return (PCIDevice *)d;
}