From patchwork Thu Mar 17 08:15:17 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: 598922 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 3qQh7C6v5Yz9ssM for ; Thu, 17 Mar 2016 19:17:59 +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=MDenAwMZ; dkim-atps=neutral Received: from localhost ([::1]:33231 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agT82-00053q-0I for incoming@patchwork.ozlabs.org; Thu, 17 Mar 2016 04:17:58 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34164) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agT7V-0003ym-7j for qemu-devel@nongnu.org; Thu, 17 Mar 2016 04:17:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1agT7S-0004xp-9P for qemu-devel@nongnu.org; Thu, 17 Mar 2016 04:17:25 -0400 Received: from m12-16.163.com ([220.181.12.16]:37879) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1agT7R-0004wt-OV for qemu-devel@nongnu.org; Thu, 17 Mar 2016 04:17:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=ybQvNtcWIEfPrA1Lgc tce8f0RE9wQXlbAQhPrZ1RWpI=; b=MDenAwMZjIrrS9kKWm68tTA1gqFRB1HKBG GAjOaRMnnxv/ITyJyhUHLA3fr7c1202B+Err6fVlISwTNmQ4tcj2Hhwglwfn/Rfu q7Rrg1OJzuQaGrbEtjwVvJfuL+nzhL/0NI4uhGKon2JsFagnvbnKAf3jhHU6J3sL FLW+tZgK8= Received: from localhost.localdomain (unknown [101.254.142.162]) by smtp12 (Coremail) with SMTP id EMCowEDp6kLjZ+pWZ0wrAA--.19252S6; Thu, 17 Mar 2016 16:17:19 +0800 (CST) From: xiaoqiang zhao To: qemu-devel@nongnu.org Date: Thu, 17 Mar 2016 16:15:17 +0800 Message-Id: <1458202517-3701-5-git-send-email-zxq_yx_007@163.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458202517-3701-1-git-send-email-zxq_yx_007@163.com> References: <1458202517-3701-1-git-send-email-zxq_yx_007@163.com> X-CM-TRANSID: EMCowEDp6kLjZ+pWZ0wrAA--.19252S6 X-Coremail-Antispam: 1Uf129KBjvJXoW7tw47Ar15KFyDGF4rury5twb_yoW8ZFyUpF Z7ZFs0krWxAr4DWrZ7Jw1qvF15Awn7K3Z7Cr48tws3trW2kry3Jan7Wa4fAF4UKFZYqa1f tw48Ary7ta15Kw7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jsfHUUUUUU= X-Originating-IP: [101.254.142.162] X-CM-SenderInfo: 520ts5t0bqili6rwjhhfrp/xtbBEg8vxlZXwpm5rQAAs6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 220.181.12.16 Cc: pbonzini@redhat.com, michael@walle.cc, kraxel@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v2 4/4] hw/audio: QOM'ify milkymist-ac97.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 --- hw/audio/milkymist-ac97.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/hw/audio/milkymist-ac97.c b/hw/audio/milkymist-ac97.c index 6a3b536..ac78e00 100644 --- a/hw/audio/milkymist-ac97.c +++ b/hw/audio/milkymist-ac97.c @@ -284,10 +284,10 @@ static int ac97_post_load(void *opaque, int version_id) return 0; } -static int milkymist_ac97_init(SysBusDevice *dev) +static void milkymist_ac97_init(Object *obj) { - MilkymistAC97State *s = MILKYMIST_AC97(dev); - + MilkymistAC97State *s = MILKYMIST_AC97(obj); + SysBusDevice *dev = SYS_BUS_DEVICE(obj); struct audsettings as; sysbus_init_irq(dev, &s->crrequest_irq); sysbus_init_irq(dev, &s->crreply_irq); @@ -306,11 +306,9 @@ static int milkymist_ac97_init(SysBusDevice *dev) s->voice_out = AUD_open_out(&s->card, s->voice_out, "mm_ac97.out", s, ac97_out_cb, &as); - memory_region_init_io(&s->regs_region, OBJECT(s), &ac97_mmio_ops, s, + memory_region_init_io(&s->regs_region, obj, &ac97_mmio_ops, s, "milkymist-ac97", R_MAX * 4); sysbus_init_mmio(dev, &s->regs_region); - - return 0; } static const VMStateDescription vmstate_milkymist_ac97 = { @@ -327,9 +325,7 @@ static const VMStateDescription vmstate_milkymist_ac97 = { static void milkymist_ac97_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass); - k->init = milkymist_ac97_init; dc->reset = milkymist_ac97_reset; dc->vmsd = &vmstate_milkymist_ac97; } @@ -338,6 +334,7 @@ static const TypeInfo milkymist_ac97_info = { .name = TYPE_MILKYMIST_AC97, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(MilkymistAC97State), + .instance_init = milkymist_ac97_init, .class_init = milkymist_ac97_class_init, };