From nobody Tue Nov 18 09:08:07 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1609122429; cv=none; d=zohomail.com; s=zohoarc; b=L29F1fB1tGj0xl3xCF8+VoQUhDiNG2Lx/msFBS3PrD/WgG6Md3dxefGvcrLnDpeUxp6ICjYlOybcm/YP7J7NRmy9CSugKstf4e8eQyhkEPQdfts3Hrkba64yWbFbxb43yih2N40E0Mn9ma+Bsxn0w3gQWWcTQ7qBkjFDp4e9WZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609122429; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=D+toO5YpMRu3HMcQd7sdwqatgkzrAEB2AEX/Qos92kY=; b=Km2pLHrca+uWha2kJpUoKrryVNbqA5la4y6TUUZ388R9/UJ1wWet4VrzRrMeKSqjqh0592xWLMb+Afwft+ImxfaV/hIfnCBgmT1Dcrvq/TujCdN3p6NO1Q9Zz0zfKkNrsc8hlmptA+7mJE3bgpSNU9qXovuJpaAoUyAIJM3DTsU= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1609122429515587.4471472300575; Sun, 27 Dec 2020 18:27:09 -0800 (PST) Received: from localhost ([::1]:44674 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktiFX-0000p2-VZ for importer@patchew.org; Sun, 27 Dec 2020 21:27:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktiD0-0007SJ-W4 for qemu-devel@nongnu.org; Sun, 27 Dec 2020 21:24:31 -0500 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:57206) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktiCx-0003vB-7I for qemu-devel@nongnu.org; Sun, 27 Dec 2020 21:24:30 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id BEC6D7470F0; Mon, 28 Dec 2020 03:24:23 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 35A76746552; Mon, 28 Dec 2020 03:24:23 +0100 (CET) Message-Id: <43d949fea01d0ceacc677c9d68b8e64bb637cc21.1609121293.git.balaton@eik.bme.hu> In-Reply-To: References: Subject: [PATCH v2 01/10] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA Date: Mon, 28 Dec 2020 03:08:13 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org X-Spam-Probability: 8% Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2001:738:2001:2001::2001; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Huacai Chen , f4bug@amsat.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: BALATON Zoltan From: BALATON Zoltan via These parts are common between VT82C686B and VT8231 so can be shared in the future. Rename them to VIA prefix accordingly. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index b3170c70c3..2a0f85dea9 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -168,22 +168,22 @@ struct VT686PMState { uint32_t smb_io_base; }; =20 -struct VT686AC97State { +struct VIAAC97State { PCIDevice dev; }; =20 -struct VT686MC97State { +struct VIAMC97State { PCIDevice dev; }; =20 #define TYPE_VT82C686B_PM_DEVICE "VT82C686B_PM" OBJECT_DECLARE_SIMPLE_TYPE(VT686PMState, VT82C686B_PM_DEVICE) =20 -#define TYPE_VT82C686B_MC97_DEVICE "VT82C686B_MC97" -OBJECT_DECLARE_SIMPLE_TYPE(VT686MC97State, VT82C686B_MC97_DEVICE) +#define TYPE_VIA_MC97_DEVICE "VIA_MC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAMC97State, VIA_MC97_DEVICE) =20 -#define TYPE_VT82C686B_AC97_DEVICE "VT82C686B_AC97" -OBJECT_DECLARE_SIMPLE_TYPE(VT686AC97State, VT82C686B_AC97_DEVICE) +#define TYPE_VIA_AC97_DEVICE "VIA_AC97" +OBJECT_DECLARE_SIMPLE_TYPE(VIAAC97State, VIA_AC97_DEVICE) =20 static void pm_update_sci(VT686PMState *s) { @@ -260,7 +260,7 @@ static const VMStateDescription vmstate_acpi =3D { =20 static void vt82c686b_ac97_realize(PCIDevice *dev, Error **errp) { - VT686AC97State *s =3D VT82C686B_AC97_DEVICE(dev); + VIAAC97State *s =3D VIA_AC97_DEVICE(dev); uint8_t *pci_conf =3D s->dev.config; =20 pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | @@ -274,7 +274,7 @@ void vt82c686b_ac97_init(PCIBus *bus, int devfn) { PCIDevice *dev; =20 - dev =3D pci_new(devfn, TYPE_VT82C686B_AC97_DEVICE); + dev =3D pci_new(devfn, TYPE_VIA_AC97_DEVICE); pci_realize_and_unref(dev, bus, &error_fatal); } =20 @@ -293,9 +293,9 @@ static void via_ac97_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo via_ac97_info =3D { - .name =3D TYPE_VT82C686B_AC97_DEVICE, + .name =3D TYPE_VIA_AC97_DEVICE, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VT686AC97State), + .instance_size =3D sizeof(VIAAC97State), .class_init =3D via_ac97_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, @@ -305,7 +305,7 @@ static const TypeInfo via_ac97_info =3D { =20 static void vt82c686b_mc97_realize(PCIDevice *dev, Error **errp) { - VT686MC97State *s =3D VT82C686B_MC97_DEVICE(dev); + VIAMC97State *s =3D VIA_MC97_DEVICE(dev); uint8_t *pci_conf =3D s->dev.config; =20 pci_set_word(pci_conf + PCI_COMMAND, PCI_COMMAND_INVALIDATE | @@ -318,7 +318,7 @@ void vt82c686b_mc97_init(PCIBus *bus, int devfn) { PCIDevice *dev; =20 - dev =3D pci_new(devfn, TYPE_VT82C686B_MC97_DEVICE); + dev =3D pci_new(devfn, TYPE_VIA_MC97_DEVICE); pci_realize_and_unref(dev, bus, &error_fatal); } =20 @@ -337,9 +337,9 @@ static void via_mc97_class_init(ObjectClass *klass, voi= d *data) } =20 static const TypeInfo via_mc97_info =3D { - .name =3D TYPE_VT82C686B_MC97_DEVICE, + .name =3D TYPE_VIA_MC97_DEVICE, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VT686MC97State), + .instance_size =3D sizeof(VIAMC97State), .class_init =3D via_mc97_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.21.3