From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49618)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoGLA-0007Os-3U
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 15:43:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoGL7-0004GH-CV
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 15:43:28 -0400
Received: from mail-lb0-x22f.google.com ([2a00:1450:4010:c04::22f]:36687)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <paolo.bonzini@gmail.com>) id 1ZoGL7-0004GD-5h
	for qemu-devel@nongnu.org; Mon, 19 Oct 2015 15:43:25 -0400
Received: by lbcao8 with SMTP id ao8so153598081lbc.3
	for <qemu-devel@nongnu.org>; Mon, 19 Oct 2015 12:43:24 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
References: <alpine.DEB.2.02.1510191810510.27957@kaball.uk.xensource.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <562547D9.4010206@redhat.com>
Date: Mon, 19 Oct 2015 21:43:21 +0200
MIME-Version: 1.0
In-Reply-To: <alpine.DEB.2.02.1510191810510.27957@kaball.uk.xensource.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] xen_platform: switch to realize
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>, qemu-devel@nongnu.org



On 19/10/2015 19:13, Stefano Stabellini wrote:
> Use realize to initialize the xen_platform device
> 
> Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> 
> diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
> index 8682c42..5bb701f 100644
> --- a/hw/i386/xen/xen_platform.c
> +++ b/hw/i386/xen/xen_platform.c
> @@ -382,7 +382,7 @@ static const VMStateDescription vmstate_xen_platform = {
>      }
>  };
>  
> -static int xen_platform_initfn(PCIDevice *dev)
> +static void xen_platform_initfn(PCIDevice *dev, Error **errp)
>  {
>      PCIXenPlatformState *d = XEN_PLATFORM(dev);
>      uint8_t *pci_conf;
> @@ -408,7 +408,7 @@ static int xen_platform_initfn(PCIDevice *dev)
>  
>      platform_fixed_ioport_init(d);
>  
> -    return 0;
> +    return;

Useless return (also this does not remove the problematic assertion).

Paolo

>  }
>  
>  static void platform_reset(DeviceState *dev)
> @@ -423,7 +423,7 @@ static void xen_platform_class_init(ObjectClass *klass, void *data)
>      DeviceClass *dc = DEVICE_CLASS(klass);
>      PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
>  
> -    k->init = xen_platform_initfn;
> +    k->realize = xen_platform_initfn;
>      k->vendor_id = PCI_VENDOR_ID_XEN;
>      k->device_id = PCI_DEVICE_ID_XEN_PLATFORM;
>      k->class_id = PCI_CLASS_OTHERS << 8 | 0x80;
> 
>