From nobody Tue Nov 18 10:37:46 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) client-ip=209.85.221.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707060; cv=none; d=zohomail.com; s=zohoarc; b=aOmGXMaHOPed1Knm1M//ng8b67qoQEzZAXp7V3N5OUN2kFbqFtu7W6kOA1BUaHVmLaKTu6ITlU/67c13JOSS2WhKPAUjZmSVNb0hKjQ5dyNEk3Rp2yzf+HKS+hnPexLZHybnSppDaA4FDDezo38TRpLQUVOCWAU8MR66MhqH2LE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707060; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=TmDPD6MXF8mA8RyDbydGI6yo0ymCSoqGu3VOAJS5hfo=; b=U0qlMkYDOW7balsJtkxUGmlSEQj5oUCauoryXBGSZv/Z+r9qc7RY4OvSHMB5av0spXih5LfoA2L6qHwpcaHV63XVmK1RjJrcZVDvVvOVX/R8oE2ueYYsp3KOYnXFodug/0gTInlKR9rieKnrOaIcthCsO8TLjqXZV36Yd7+1nDM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by mx.zohomail.com with SMTPS id 1609707060034333.5677598800594; Sun, 3 Jan 2021 12:51:00 -0800 (PST) Received: by mail-wr1-f42.google.com with SMTP id 91so29443742wrj.7 for ; Sun, 03 Jan 2021 12:50:59 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (194.red-83-57-172.dynamicip.rima-tde.net. [83.57.172.194]) by smtp.gmail.com with ESMTPSA id j59sm92191927wrj.13.2021.01.03.12.50.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:50:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TmDPD6MXF8mA8RyDbydGI6yo0ymCSoqGu3VOAJS5hfo=; b=RUTfFvuFD8YJ36Hplbfhraa7GQSatpiTwfG9c3uowWZl+QAdZm8GtKaCwyDd7NjsML 0BGQaYYT69maB44kmDRUd6qv259h6Sro0jIHFRpEVHDtSZnAe6HtxivPKH9yrW3RFGDW ksinoN5/cL9SqGh+g/khE4T2kPKxjLzdWgA//fRGEepCgo1Ix9czmrMrdKGjDdIWj0Vf GvdzsmT9a7q4F67f1rGSZo4FY4EL9hbCd2zH6MSMJ+F9hY3qjJAfm6hyDjPIrEWRTZwQ kM50k2McG7RfDdgoLU0/ZFxPiF2gCBN3jU3lGRmbMPg+Ic9mj9pw5gxVYjgP82p1nTds pLpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TmDPD6MXF8mA8RyDbydGI6yo0ymCSoqGu3VOAJS5hfo=; b=RTfl6N2phH8HRfJwPoaqb4xcd7AWQsfsPISJe+ivZxYaLmjktz3ZiUvZwBrxRf8ss9 YwNokwoMjDZ/ebRPV9NCKWZ3CEauAQhqNzih/JcgOH+dLEm6H2d2ESodYFH6ZliGKDQ7 zAuLEC4F1x4YiceX57iNzs9Eg/AbIfce8dSSdTkSvs8gSm1rQBc1UBlzHbWKXiKVdvtm 09JYlqF47p0rjtlvMPgX6FCkTZgCYIfY4okn5zuRqApFooUPFzNvvTwIgRwO50oxKZc6 BqSZXkf/yN7+pcbe2Iu0iPX8IqBKXBgJ/3ya1m46L/4YOpY2I8Z9+THDb5jF7wN3nM12 4doA== X-Gm-Message-State: AOAM531dn3hsxLz6xrg2MVVVQJfMVtNVxlrEf0riV+r592B7m2ehDAJJ NcNvIe0K5zQqCKvNFmZoi6U= X-Google-Smtp-Source: ABdhPJzw7J7eXKUnwN4xK1xSJXXn0j9xhRKnpQwmJZLvErFjuCIC7zRGRx9KbCWxfn3cZt8o+l4BgQ== X-Received: by 2002:a5d:6106:: with SMTP id v6mr75780344wrt.173.1609707058232; Sun, 03 Jan 2021 12:50:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Aurelien Jarno , Huacai Chen , Jiaxun Yang , BALATON Zoltan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 07/35] vt82c686: Rename AC97/MC97 parts from VT82C686B to VIA Date: Sun, 3 Jan 2021 21:49:53 +0100 Message-Id: <20210103205021.2837760-8-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210103205021.2837760-1-f4bug@amsat.org> References: <20210103205021.2837760-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) From: BALATON Zoltan 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 Message-Id: <510ddb17836a2c2e68a27cf2dcaee420bc2efbc1.1609584215.git.balato= n@eik.bme.hu> Signed-off-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 b3170c70c3d..2a0f85dea94 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.26.2