From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47466) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxCuF-0000Vt-5k for qemu-devel@nongnu.org; Fri, 03 Aug 2012 04:06:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SxCu9-0006rr-96 for qemu-devel@nongnu.org; Fri, 03 Aug 2012 04:06:47 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:43803) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SxCu9-0006jn-4I for qemu-devel@nongnu.org; Fri, 03 Aug 2012 04:06:41 -0400 Received: by mail-yx0-f173.google.com with SMTP id l1so500907yen.4 for ; Fri, 03 Aug 2012 01:06:41 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 3 Aug 2012 10:06:13 +0200 Message-Id: <1343981180-23817-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1343981180-23817-1-git-send-email-pbonzini@redhat.com> References: <1343981180-23817-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 03/10] megasas: Update function megasys_scsi_uninit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil From: Stefan Weil 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 Signed-off-by: Paolo Bonzini --- hw/megasas.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/hw/megasas.c b/hw/megasas.c index 9a0eab1..8a4960f 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 = { -- 1.7.10.4