From patchwork Wed Mar 16 09:24:01 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: 598190 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 3qQ5hd4zc0z9sD5 for ; Wed, 16 Mar 2016 20:26:25 +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=iEnFZg10; dkim-atps=neutral Received: from localhost ([::1]:54091 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag7ih-0001hS-Bp for incoming@patchwork.ozlabs.org; Wed, 16 Mar 2016 05:26:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34688) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag7iD-0000jM-Tu for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ag7i9-0004KN-MJ for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:25:53 -0400 Received: from m12-13.163.com ([220.181.12.13]:58075) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ag7i7-0004Gb-Qz for qemu-devel@nongnu.org; Wed, 16 Mar 2016 05:25:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=QISmg4N4+pMzSDDe9Q AsN1SHDKcRfdDd6V26tuOAqs4=; b=iEnFZg108JPr7XaLdote50ovPmBgegpgio Ps9Xi+zdkLuo5mICCrHlVQjwhA5jTtMXNaI6nXwZ8hWRiCbyEmiWQbkBEq0jKO4z G8BidVd2fHAVbW6fmvxmL3JhlF+X8Sa+dcr+NEJ6inSQ56nTBOsQhzWm7FiA5RSB IocVP8UyA= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp9 (Coremail) with SMTP id DcCowACndU2BJulW1f_qAA--.46101S3; Wed, 16 Mar 2016 17:25:40 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Wed, 16 Mar 2016 17:24:01 +0800 Message-Id: <1458120244-30976-2-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458120244-30976-1-git-send-email-zxq_yx_007@163.com> References: <1458120244-30976-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: DcCowACndU2BJulW1f_qAA--.46101S3 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw4rAw1kKw1UJryrKw47twb_yoW8XrWrpF 97uFykCr47tFsrZrZ7JFn5uas5Jwn3C3yxKryxXwnayan7KrykAFnayayavrWUtrZ2yF15 Xw48JF47Aa1UJw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jcMa8UUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/1tbiOxQuxlXlSXRU2QAAsH X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.13 Cc: michael@walle.cc, kraxel@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH 1/4] hw/audio: QOM'ify cs4231.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Drop the old SysBus init function and use instance_init Signed-off-by: xiaoqiang zhao Reviewed-by: Paolo Bonzini --- hw/audio/cs4231.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index caf97c1..30690f9 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -145,16 +145,15 @@ static const VMStateDescription vmstate_cs4231 = { } }; -static int cs4231_init1(SysBusDevice *dev) +static void cs4231_init(Object *obj) { - CSState *s = CS4231(dev); + CSState *s = CS4231(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); - memory_region_init_io(&s->iomem, OBJECT(s), &cs_mem_ops, s, "cs4321", + memory_region_init_io(&s->iomem, obj, &cs_mem_ops, s, "cs4321", CS_SIZE); sysbus_init_mmio(dev, &s->iomem); sysbus_init_irq(dev, &s->irq); - - return 0; } static Property cs4231_properties[] = { @@ -164,9 +163,7 @@ static Property cs4231_properties[] = { static void cs4231_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = cs4231_init1; dc->reset = cs_reset; dc->vmsd = &vmstate_cs4231; dc->props = cs4231_properties; @@ -176,6 +173,7 @@ static const TypeInfo cs4231_info = { .name = TYPE_CS4231, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(CSState), + .instance_init = cs4231_init, .class_init = cs4231_class_init, };