From patchwork Fri Nov 30 09:38:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mao Zhongyi X-Patchwork-Id: 1005837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cmss.chinamobile.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 435qFh2lJ5z9s8F for ; Fri, 30 Nov 2018 20:43:20 +1100 (AEDT) Received: from localhost ([::1]:58980 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfKP-0000Id-RH for incoming@patchwork.ozlabs.org; Fri, 30 Nov 2018 04:43:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38518) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfGj-0006Aw-OW for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSfGg-0002Ss-8B for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:29 -0500 Received: from cmccmta1.chinamobile.com ([221.176.66.79]:35147) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSfGf-0002Nm-EN for qemu-devel@nongnu.org; Fri, 30 Nov 2018 04:39:26 -0500 Received: from spf.mail.chinamobile.com (unknown[172.16.121.13]) by rmmx-syy-dmz-app02-12002 (RichMail) with SMTP id 2ee25c01053b346-a1cf2; Fri, 30 Nov 2018 17:39:07 +0800 (CST) X-RM-TRANSID: 2ee25c01053b346-a1cf2 X-RM-TagInfo: emlType=0 X-RM-SPAM-FLAG: 00000000 Received: from maozy-host.lan (unknown[112.25.154.148]) by rmsmtp-syy-appsvr07-12007 (RichMail) with SMTP id 2ee75c01052eaec-48578; Fri, 30 Nov 2018 17:39:07 +0800 (CST) X-RM-TRANSID: 2ee75c01052eaec-48578 From: Mao Zhongyi To: qemu-devel@nongnu.org Date: Fri, 30 Nov 2018 17:38:36 +0800 Message-Id: <20181130093852.20739-6-maozhongyi@cmss.chinamobile.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181130093852.20739-1-maozhongyi@cmss.chinamobile.com> References: <20181130093852.20739-1-maozhongyi@cmss.chinamobile.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 221.176.66.79 Subject: [Qemu-devel] [PATCH v3 05/21] display/g364fb: Convert sysbus init function to realize function 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: Mao Zhongyi , f4bug@amsat.org, alistair.francis@wdc.com, kraxel@redhat.com, pbonzini@redhat.com, Zhang Shengju Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Use DeviceClass rather than SysBusDeviceClass in g364fb_sysbus_class_init(). Cc: pbonzini@redhat.com Cc: kraxel@redhat.com Cc: f4bug@amsat.org Cc: alistair.francis@wdc.com Signed-off-by: Mao Zhongyi Signed-off-by: Zhang Shengju Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Gerd Hoffmann --- hw/display/g364fb.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c index 8ad7e5d824..3407adf98d 100644 --- a/hw/display/g364fb.c +++ b/hw/display/g364fb.c @@ -489,18 +489,16 @@ typedef struct { G364State g364; } G364SysBusState; -static int g364fb_sysbus_init(SysBusDevice *sbd) +static void g364fb_sysbus_realize(DeviceState *dev, Error **errp) { - DeviceState *dev = DEVICE(sbd); G364SysBusState *sbs = G364(dev); G364State *s = &sbs->g364; + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); g364fb_init(dev, s); sysbus_init_irq(sbd, &s->irq); sysbus_init_mmio(sbd, &s->mem_ctrl); sysbus_init_mmio(sbd, &s->mem_vram); - - return 0; } static void g364fb_sysbus_reset(DeviceState *d) @@ -518,9 +516,8 @@ static Property g364fb_sysbus_properties[] = { static void g364fb_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = g364fb_sysbus_init; + dc->realize = g364fb_sysbus_realize; set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories); dc->desc = "G364 framebuffer"; dc->reset = g364fb_sysbus_reset;