From: Stefan Weil <sw@weilnetz.de>
Date: Tue, 31 Jul 2012 05:54:57 +0000 (+0200)
Subject: megasas: Update function megasys_scsi_uninit
X-Git-Tag: v1.2.0-rc0~88^2~6
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=18fc611b81d449827916f1cb27b3dbf0bcf364a8;p=users%2Fdwmw2%2Fqemu.git

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>
---

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 = {