From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a9zJc-0001uw-Jo for qemu-devel@nongnu.org; Fri, 18 Dec 2015 12:59:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a9zJY-0001Kp-LO for qemu-devel@nongnu.org; Fri, 18 Dec 2015 12:59:40 -0500 References: <1450436632-23980-1-git-send-email-caoj.fnst@cn.fujitsu.com> <1450436632-23980-5-git-send-email-caoj.fnst@cn.fujitsu.com> From: Paolo Bonzini Message-ID: <56744982.80704@redhat.com> Date: Fri, 18 Dec 2015 18:59:30 +0100 MIME-Version: 1.0 In-Reply-To: <1450436632-23980-5-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 4/5] gt64120: convert to realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cao jin , qemu-devel@nongnu.org Cc: ehabkost@redhat.com, mst@redhat.com, qemu-trivial@nongnu.org, leon.alrae@imgtec.com, aurelien@aurel32.net, rth@twiddle.net Cc: qemu-trivial@nongnu.org On 18/12/2015 12:03, Cao jin wrote: > Signed-off-by: Cao jin > --- > hw/mips/gt64xxx_pci.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/hw/mips/gt64xxx_pci.c b/hw/mips/gt64xxx_pci.c > index f76a9fd..c1f3c9c 100644 > --- a/hw/mips/gt64xxx_pci.c > +++ b/hw/mips/gt64xxx_pci.c > @@ -1193,7 +1193,7 @@ static int gt64120_init(SysBusDevice *dev) > return 0; > } > > -static int gt64120_pci_init(PCIDevice *d) > +static void gt64120_pci_realize(PCIDevice *d, Error **errp) > { > /* FIXME: Malta specific hw assumptions ahead */ > pci_set_word(d->config + PCI_COMMAND, 0); > @@ -1207,8 +1207,6 @@ static int gt64120_pci_init(PCIDevice *d) > pci_set_long(d->config + PCI_BASE_ADDRESS_4, 0x14000000); > pci_set_long(d->config + PCI_BASE_ADDRESS_5, 0x14000001); > pci_set_byte(d->config + 0x3d, 0x01); > - > - return 0; > } > > static void gt64120_pci_class_init(ObjectClass *klass, void *data) > @@ -1216,7 +1214,7 @@ static void gt64120_pci_class_init(ObjectClass *klass, void *data) > PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > DeviceClass *dc = DEVICE_CLASS(klass); > > - k->init = gt64120_pci_init; > + k->realize = gt64120_pci_realize; > k->vendor_id = PCI_VENDOR_ID_MARVELL; > k->device_id = PCI_DEVICE_ID_MARVELL_GT6412X; > k->revision = 0x10; >