From patchwork Wed Jan 11 09:33:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9509601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 09B8A60231 for ; Wed, 11 Jan 2017 09:42:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08253284ED for ; Wed, 11 Jan 2017 09:42:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F074C2853C; Wed, 11 Jan 2017 09:42:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 892C6284ED for ; Wed, 11 Jan 2017 09:42:14 +0000 (UTC) Received: from localhost ([::1]:52583 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRFQ5-0004Ab-4f for patchwork-qemu-devel@patchwork.kernel.org; Wed, 11 Jan 2017 04:42:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRFI4-0004bd-T9 for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:33:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRFI0-0006Fo-10 for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:33:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48346) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cRFHz-0006F6-RB for qemu-devel@nongnu.org; Wed, 11 Jan 2017 04:33:51 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E0025C0467F0; Wed, 11 Jan 2017 09:33:51 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-51.ams2.redhat.com [10.36.116.51]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v0B9XoMH012884; Wed, 11 Jan 2017 04:33:51 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 4F97280788; Wed, 11 Jan 2017 10:33:49 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 11 Jan 2017 10:33:44 +0100 Message-Id: <1484127227-26496-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1484127227-26496-1-git-send-email-kraxel@redhat.com> References: <1484127227-26496-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 11 Jan 2017 09:33:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/5] hw/audio: QOM'ify pl041.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: xiaoqiang zhao , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: xiaoqiang zhao split the old SysBus init function into an instance_init and Device realize function Signed-off-by: xiaoqiang zhao Message-id: 20161231011720.3965-3-zxq_yx_007@163.com Signed-off-by: Gerd Hoffmann --- hw/audio/pl041.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/hw/audio/pl041.c b/hw/audio/pl041.c index 6e9c104..c8cc503 100644 --- a/hw/audio/pl041.c +++ b/hw/audio/pl041.c @@ -521,12 +521,23 @@ static const MemoryRegionOps pl041_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static int pl041_init(SysBusDevice *dev) +static void pl041_init(Object *obj) { + SysBusDevice *dev = SYS_BUS_DEVICE(obj); PL041State *s = PL041(dev); DBG_L1("pl041_init 0x%08x\n", (uint32_t)s); + /* Connect the device to the sysbus */ + memory_region_init_io(&s->iomem, obj, &pl041_ops, s, "pl041", 0x1000); + sysbus_init_mmio(dev, &s->iomem); + sysbus_init_irq(dev, &s->irq); +} + +static void pl041_realize(DeviceState *dev, Error **errp) +{ + PL041State *s = PL041(dev); + /* Check the device properties */ switch (s->fifo_depth) { case 8: @@ -545,18 +556,10 @@ static int pl041_init(SysBusDevice *dev) qemu_log_mask(LOG_UNIMP, "pl041: unsupported non-compact fifo depth [%i]\n", s->fifo_depth); - return -1; } - /* Connect the device to the sysbus */ - memory_region_init_io(&s->iomem, OBJECT(s), &pl041_ops, s, "pl041", 0x1000); - sysbus_init_mmio(dev, &s->iomem); - sysbus_init_irq(dev, &s->irq); - /* Init the codec */ lm4549_init(&s->codec, &pl041_request_data, (void *)s); - - return 0; } static const VMStateDescription vmstate_pl041_regfile = { @@ -627,9 +630,8 @@ static Property pl041_device_properties[] = { static void pl041_device_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = pl041_init; + dc->realize = pl041_realize; set_bit(DEVICE_CATEGORY_SOUND, dc->categories); dc->reset = pl041_device_reset; dc->vmsd = &vmstate_pl041; @@ -640,6 +642,7 @@ static const TypeInfo pl041_device_info = { .name = TYPE_PL041, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PL041State), + .instance_init = pl041_init, .class_init = pl041_device_class_init, };