From patchwork Wed Aug 1 10:19:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 174430 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4AD652C00B0 for ; Wed, 1 Aug 2012 20:19:44 +1000 (EST) Received: from localhost ([::1]:54031 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwW1m-0007J5-BK for incoming@patchwork.ozlabs.org; Wed, 01 Aug 2012 06:19:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:39932) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwW1f-0007IQ-N6 for qemu-devel@nongnu.org; Wed, 01 Aug 2012 06:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SwW1a-0001C8-4A for qemu-devel@nongnu.org; Wed, 01 Aug 2012 06:19:35 -0400 Received: from smtp.ctxuk.citrix.com ([62.200.22.115]:24839 helo=SMTP.EU.CITRIX.COM) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SwW1Z-0001Br-UN for qemu-devel@nongnu.org; Wed, 01 Aug 2012 06:19:30 -0400 X-IronPort-AV: E=Sophos;i="4.77,693,1336348800"; d="scan'208";a="13799227" Received: from lonpmailmx01.citrite.net ([10.30.203.162]) by LONPIPO01.EU.CITRIX.COM with ESMTP/TLS/RC4-MD5; 01 Aug 2012 10:19:27 +0000 Received: from kaball.uk.xensource.com (10.80.2.59) by LONPMAILMX01.citrite.net (10.30.203.162) with Microsoft SMTP Server id 8.3.213.0; Wed, 1 Aug 2012 11:19:27 +0100 Date: Wed, 1 Aug 2012 11:19:09 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 62.200.22.115 Cc: xen-devel@lists.xensource.com, Ian Campbell , Stefano Stabellini , fantonifabio@tiscali.it Subject: [Qemu-devel] [PATCH] fix Xen compilation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org xen_pt_unregister_device is used as PCIUnregisterFunc, so it should match the type. Signed-off-by: Stefano Stabellini Tested-by: Andreas Färber diff --git a/hw/xen_pt.c b/hw/xen_pt.c index fdf68aa..307119a 100644 --- a/hw/xen_pt.c +++ b/hw/xen_pt.c @@ -764,7 +764,7 @@ out: return 0; } -static int xen_pt_unregister_device(PCIDevice *d) +static void xen_pt_unregister_device(PCIDevice *d) { XenPCIPassthroughState *s = DO_UPCAST(XenPCIPassthroughState, dev, d); uint8_t machine_irq = s->machine_irq; @@ -814,8 +814,6 @@ static int xen_pt_unregister_device(PCIDevice *d) memory_listener_unregister(&s->memory_listener); xen_host_pci_device_put(&s->real_device); - - return 0; } static Property xen_pci_passthrough_properties[] = {