aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2012-07-31 07:54:57 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2012-08-03 10:01:35 +0200
commit18fc611b81d449827916f1cb27b3dbf0bcf364a8 (patch)
tree1e6f73c66cb0ad61d22a461a83930857050dc695
parentae5708b36d34f72aa8c91e3dad56b266dfde73f1 (diff)
megasas: Update function megasys_scsi_uninit
Commit f90c2bcdbc69e41e575f868b984c3e2de8f51bac changed PCIUnregisterFunc, therefore the function prototype needs an update. megasas.o is currently not linked, so this bug was not detected by the buildbots. Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--hw/megasas.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/megasas.c b/hw/megasas.c
index 9a0eab1c98..8a4960f8a1 100644
--- a/hw/megasas.c
+++ b/hw/megasas.c
@@ -2040,7 +2040,7 @@ static const VMStateDescription vmstate_megasas = {
}
};
-static int megasas_scsi_uninit(PCIDevice *d)
+static void megasas_scsi_uninit(PCIDevice *d)
{
MegasasState *s = DO_UPCAST(MegasasState, dev, d);
@@ -2050,7 +2050,6 @@ static int megasas_scsi_uninit(PCIDevice *d)
memory_region_destroy(&s->mmio_io);
memory_region_destroy(&s->port_io);
memory_region_destroy(&s->queue_io);
- return 0;
}
static const struct SCSIBusInfo megasas_scsi_info = {