From patchwork Mon Jun 20 16:39:07 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Walle X-Patchwork-Id: 9188323 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 9D912601C0 for ; Mon, 20 Jun 2016 17:32:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F36027813 for ; Mon, 20 Jun 2016 17:32:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8392F27BEE; Mon, 20 Jun 2016 17:32:27 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 F2E3027813 for ; Mon, 20 Jun 2016 17:32:26 +0000 (UTC) Received: from localhost ([::1]:45269 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF33i-00033h-4x for patchwork-qemu-devel@patchwork.kernel.org; Mon, 20 Jun 2016 13:32:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37020) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF2FH-0008D2-OP for qemu-devel@nongnu.org; Mon, 20 Jun 2016 12:40:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bF2FF-0007CL-HK for qemu-devel@nongnu.org; Mon, 20 Jun 2016 12:40:18 -0400 Received: from ssl.serverraum.org ([2a01:4f8:130:84d6::1:2]:42606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bF2FF-0007CC-AX for qemu-devel@nongnu.org; Mon, 20 Jun 2016 12:40:17 -0400 Received: from thanatos.fritz.box (unknown [IPv6:2001:6f8:968:0:56be:f7ff:fe37:9af7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by ssl.serverraum.org (Postfix) with ESMTPSA id 0C27E22381; Mon, 20 Jun 2016 18:40:14 +0200 (CEST) Authentication-Results: ssl.serverraum.org; dmarc=none header.from=walle.cc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walle.cc; s=mail2016061301; t=1466440815; bh=Sy61JBBJftxfqh26/sUYR0FLw5AFf0tTaxVAGYuDzLU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RuDBiQpyVBeL13z/oWMjqaznqyC+vswIeoSKi8Xfwkv2kikDC5qgpq+K1xlwWDofN ih8WvfeNxFFTDRGV4pYiql2R6Pnlilgy0cZkFCSjCAiWW/nHmvjrepTl0pbviS9oKb gH8m2Br7YivsGMeDgawX/4Aqlpdrab39W+0+HHyo= From: Michael Walle To: qemu-devel@nongnu.org Date: Mon, 20 Jun 2016 18:39:07 +0200 Message-Id: <1466440749-17195-5-git-send-email-michael@walle.cc> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1466440749-17195-1-git-send-email-michael@walle.cc> References: <1466440749-17195-1-git-send-email-michael@walle.cc> X-Virus-Scanned: clamav-milter 0.99.2 at web X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a01:4f8:130:84d6::1:2 Subject: [Qemu-devel] [PULL 4/6] hw/display: QOM'ify milkymist-vgafb.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 , Peter Maydell , Michael Walle 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 * Drop the old SysBus init function and use instance_init * Move graphic_console_init into realize stage Signed-off-by: xiaoqiang zhao Reviewed-by: Peter Maydell Acked-by: Michael Walle Tested-by: Michael Walle Signed-off-by: Michael Walle --- hw/display/milkymist-vgafb.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/hw/display/milkymist-vgafb.c b/hw/display/milkymist-vgafb.c index 19ca256..39e16d6 100644 --- a/hw/display/milkymist-vgafb.c +++ b/hw/display/milkymist-vgafb.c @@ -292,17 +292,21 @@ static const GraphicHwOps vgafb_ops = { .gfx_update = vgafb_update_display, }; -static int milkymist_vgafb_init(SysBusDevice *dev) +static void milkymist_vgafb_init(Object *obj) { - MilkymistVgafbState *s = MILKYMIST_VGAFB(dev); + MilkymistVgafbState *s = MILKYMIST_VGAFB(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); memory_region_init_io(&s->regs_region, OBJECT(s), &vgafb_mmio_ops, s, "milkymist-vgafb", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); +} - s->con = graphic_console_init(DEVICE(dev), 0, &vgafb_ops, s); +static void milkymist_vgafb_realize(DeviceState *dev, Error **errp) +{ + MilkymistVgafbState *s = MILKYMIST_VGAFB(dev); - return 0; + s->con = graphic_console_init(dev, 0, &vgafb_ops, s); } static int vgafb_post_load(void *opaque, int version_id) @@ -331,18 +335,18 @@ static Property milkymist_vgafb_properties[] = { static void milkymist_vgafb_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_vgafb_init; dc->reset = milkymist_vgafb_reset; dc->vmsd = &vmstate_milkymist_vgafb; dc->props = milkymist_vgafb_properties; + dc->realize = milkymist_vgafb_realize; } static const TypeInfo milkymist_vgafb_info = { .name = TYPE_MILKYMIST_VGAFB, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistVgafbState), + .instance_init = milkymist_vgafb_init, .class_init = milkymist_vgafb_class_init, };