From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:54935)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SwZ3u-0005DR-2C
	for qemu-devel@nongnu.org; Wed, 01 Aug 2012 09:34:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SwZ3k-0003y8-GS
	for qemu-devel@nongnu.org; Wed, 01 Aug 2012 09:34:06 -0400
Received: from cantor2.suse.de ([195.135.220.15]:54747 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1SwZ3k-0003xf-AL
	for qemu-devel@nongnu.org; Wed, 01 Aug 2012 09:33:56 -0400
Message-ID: <5019303E.30508@suse.de>
Date: Wed, 01 Aug 2012 15:33:50 +0200
From: =?ISO-8859-1?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <alpine.DEB.2.02.1208011114490.4645@kaball.uk.xensource.com>
In-Reply-To: <alpine.DEB.2.02.1208011114490.4645@kaball.uk.xensource.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] fix Xen compilation
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Anthony Liguori <anthony@codemonkey.ws>, xen-devel@lists.xensource.com, qemu-devel@nongnu.org, fantonifabio@tiscali.it, Ian Campbell <Ian.Campbell@citrix.com>

Am 01.08.2012 12:19, schrieb Stefano Stabellini:
> xen_pt_unregister_device is used as PCIUnregisterFunc, so it should
> match the type.
>=20
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>

Tested-by: Andreas F=E4rber <afaerber@suse.de>

/-F

>=20
> 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;
>  }
> =20
> -static int xen_pt_unregister_device(PCIDevice *d)
> +static void xen_pt_unregister_device(PCIDevice *d)
>  {
>      XenPCIPassthroughState *s =3D DO_UPCAST(XenPCIPassthroughState, de=
v, d);
>      uint8_t machine_irq =3D s->machine_irq;
> @@ -814,8 +814,6 @@ static int xen_pt_unregister_device(PCIDevice *d)
>      memory_listener_unregister(&s->memory_listener);
> =20
>      xen_host_pci_device_put(&s->real_device);
> -
> -    return 0;
>  }
> =20
>  static Property xen_pci_passthrough_properties[] =3D {
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg