From patchwork Sat Oct 13 06:08:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Li Qiang X-Patchwork-Id: 10639953 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1DEF21508 for ; Sat, 13 Oct 2018 06:09:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 066DD2B5C5 for ; Sat, 13 Oct 2018 06:09:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE9832B5C9; Sat, 13 Oct 2018 06:09:16 +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=-7.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 878ED2B5C5 for ; Sat, 13 Oct 2018 06:09:16 +0000 (UTC) Received: from localhost ([::1]:43859 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBD6x-0006UV-6x for patchwork-qemu-devel@patchwork.kernel.org; Sat, 13 Oct 2018 02:09:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBD6F-0006Ba-Fj for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:08:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gBD6A-0003MF-GH for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:08:31 -0400 Received: from m12-18.163.com ([220.181.12.18]:34211) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gBD68-0003Gi-St for qemu-devel@nongnu.org; Sat, 13 Oct 2018 02:08:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=pvC4ZQIBjyEQ2LJGXN eE7iUvZ1f5W6QR6UrQzKAxNfw=; b=fqoW1/PKFouXb8KlVtNLWDZ8RHQO02qo8i mS8FwdeoD9WMtBXXlD3nzYKRvHMg8G2luLTBBeWnJurChBv+aKAcrcYSLtx10lPo vBE9YzoFtN4nAQH1oWl4y8i3CxtRrDmCH/1KI5J2Um/Ln4C/5msV8m17O+bzIJqB dWUaisI+c= Received: from ubuntu.localdomain (unknown [115.192.95.72]) by smtp14 (Coremail) with SMTP id EsCowABHjh7Ki8FbZai1Ww--.54269S2; Sat, 13 Oct 2018 14:08:11 +0800 (CST) From: Li Qiang To: kraxel@redhat.com Date: Fri, 12 Oct 2018 23:08:09 -0700 Message-Id: <20181013060809.52496-1-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 X-CM-TRANSID: EsCowABHjh7Ki8FbZai1Ww--.54269S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar4xJr4xtF1kGFWfZryDGFg_yoW8XFyrpF 1kZF1kKw45JFZxKwsavrn8J3WUWwnrGa4UKryxXF4xtFyxGryDtws7AF1jva1DWFZ5Wan8 Zrs8trWxW3y7XF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zR2XdbUUUUU= X-Originating-IP: [115.192.95.72] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiFArebVaDxxWneAABs0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 220.181.12.18 Subject: [Qemu-devel] [PATCH] hw: AC97: make it more QOMconventional 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: Li Qiang , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Li Qiang Reviewed-by: Philippe Mathieu-Daudé --- hw/audio/ac97.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c index 337402e9c6..d799533aa9 100644 --- a/hw/audio/ac97.c +++ b/hw/audio/ac97.c @@ -123,6 +123,10 @@ enum { #define MUTE_SHIFT 15 +#define TYPE_AC97 "AC97" +#define AC97(obj) \ + OBJECT_CHECK(AC97LinkState, (obj), TYPE_AC97) + #define REC_MASK 7 enum { REC_MIC = 0, @@ -1340,7 +1344,7 @@ static void ac97_on_reset (DeviceState *dev) static void ac97_realize(PCIDevice *dev, Error **errp) { - AC97LinkState *s = DO_UPCAST (AC97LinkState, dev, dev); + AC97LinkState *s = AC97(dev); uint8_t *c = s->dev.config; /* TODO: no need to override */ @@ -1389,7 +1393,7 @@ static void ac97_realize(PCIDevice *dev, Error **errp) static void ac97_exit(PCIDevice *dev) { - AC97LinkState *s = DO_UPCAST(AC97LinkState, dev, dev); + AC97LinkState *s = AC97(dev); AUD_close_in(&s->card, s->voice_pi); AUD_close_out(&s->card, s->voice_po); @@ -1399,7 +1403,7 @@ static void ac97_exit(PCIDevice *dev) static int ac97_init (PCIBus *bus) { - pci_create_simple (bus, -1, "AC97"); + pci_create_simple(bus, -1, TYPE_AC97); return 0; } @@ -1427,7 +1431,7 @@ static void ac97_class_init (ObjectClass *klass, void *data) } static const TypeInfo ac97_info = { - .name = "AC97", + .name = TYPE_AC97, .parent = TYPE_PCI_DEVICE, .instance_size = sizeof (AC97LinkState), .class_init = ac97_class_init,