From patchwork Sun Oct 23 06:31:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhao xiao qiang X-Patchwork-Id: 685504 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t1qVd6Tx9z9t1P for ; Sun, 23 Oct 2016 17:38:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=163.com header.i=@163.com header.b=dWRaWjTk; dkim-atps=neutral Received: from localhost ([::1]:39894 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byCQB-0001Y5-LG for incoming@patchwork.ozlabs.org; Sun, 23 Oct 2016 02:38:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byCKP-0005ON-UX for qemu-devel@nongnu.org; Sun, 23 Oct 2016 02:32:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1byCKN-0003eH-O9 for qemu-devel@nongnu.org; Sun, 23 Oct 2016 02:32:17 -0400 Received: from m12-16.163.com ([220.181.12.16]:53677) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1byCKM-0003dc-Ie for qemu-devel@nongnu.org; Sun, 23 Oct 2016 02:32:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=RRIGtwQqBkCeBcJdue 3Suyn9HWtYi6Wdedf/fpQ7Krs=; b=dWRaWjTkxrOjMCZRX6DyQLHUcYulaYmdmh 5NMjGQ3EBBuqykb2Qf1rru8NkvwY/07owhaDxJUNiDr9Ai0DCjUpxGZxPrFCnj7L I4vde07dZVLX5VEuc7RopiPehvJM2tt/s7R/xvwbcC4B+nH2rptFJ4jBfpvpf8/i OoUIFucNw= Received: from debian.lan (unknown [114.111.167.207]) by smtp12 (Coremail) with SMTP id EMCowABHqthVWQxYKknhBA--.56840S6; Sun, 23 Oct 2016 14:31:50 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Sun, 23 Oct 2016 14:31:35 +0800 Message-Id: <20161023063135.21058-10-zxq_yx_007@163.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161023063135.21058-1-zxq_yx_007@163.com> References: <20161023063135.21058-1-zxq_yx_007@163.com> X-CM-TRANSID: EMCowABHqthVWQxYKknhBA--.56840S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7ZF1kJr4DCFWDGry8Ww45ZFb_yoW8Kw1fpF Z3ZFn5GrWrWFZ7Z3y7tr4ku3s8Jwn3K34fGr4xCwn29r9Fkr95WF4DA3ySvr4DKrZ7uF1Y qry8trWxua1UG3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07boAwxUUUUU= X-Originating-IP: [114.111.167.207] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOxYMxlXlV9xRbwAAsi X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.16 Subject: [Qemu-devel] [PATCH 9/9] hw/sparc64: QOM'ify sun4u.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: pbonzini@redhat.com, mark.cave-ayland@ilande.co.uk, atar4qemu@gmail.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Drop the old SysBusDeviceClass::init and use instance_init or DeviceClass::realize instead Signed-off-by: xiaoqiang zhao --- hw/sparc64/sun4u.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 3165e18..aac4cb5 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -651,16 +651,16 @@ static void prom_init(hwaddr addr, const char *bios_name) } } -static int prom_init1(SysBusDevice *dev) +static void prom_init1(Object *obj) { - PROMState *s = OPENPROM(dev); + PROMState *s = OPENPROM(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); - memory_region_init_ram(&s->prom, OBJECT(s), "sun4u.prom", PROM_SIZE_MAX, + memory_region_init_ram(&s->prom, obj, "sun4u.prom", PROM_SIZE_MAX, &error_fatal); vmstate_register_ram_global(&s->prom); memory_region_set_readonly(&s->prom, true); sysbus_init_mmio(dev, &s->prom); - return 0; } static Property prom_properties[] = { @@ -670,9 +670,7 @@ static Property prom_properties[] = { static void prom_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = prom_init1; dc->props = prom_properties; } @@ -681,6 +679,7 @@ static const TypeInfo prom_info = { .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(PROMState), .class_init = prom_class_init, + .instance_init = prom_init1, }; @@ -695,15 +694,15 @@ typedef struct RamDevice { } RamDevice; /* System RAM */ -static int ram_init1(SysBusDevice *dev) +static void ram_realize(DeviceState *dev, Error **errp) { RamDevice *d = SUN4U_RAM(dev); + SysBusDevice *sbd = SYS_BUS_DEVICE(dev); memory_region_init_ram(&d->ram, OBJECT(d), "sun4u.ram", d->size, &error_fatal); vmstate_register_ram_global(&d->ram); - sysbus_init_mmio(dev, &d->ram); - return 0; + sysbus_init_mmio(sbd, &d->ram); } static void ram_init(hwaddr addr, ram_addr_t RAM_size) @@ -731,9 +730,8 @@ static Property ram_properties[] = { static void ram_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = ram_init1; + dc->realize = ram_realize; dc->props = ram_properties; }