From nobody Tue Nov 18 10:40:14 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=1609586143; cv=none; d=zohomail.com; s=zohoarc; b=IxAnXANkLFNqGA1XkHOfhoKxFbUCq8ZOTeDVGwM/2qk28M5B8FLhT7035CjPFzOYH9s1/pyeU5uLn+WpqSyndLIFKANiT3DL00Kn8rrAMByXbSKoWEPlZddR4Zfk48jTuwe1A7biqrChW7Gi8uxuI+mnuagelEHt63WR0ULUVYg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609586143; 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=o0nTOwc4NoEEoYYkeZnhOlRtEbixheMHU6Kxr6xNurU=; b=UF/KfKiX2Tzn8rWO/zkP8TuRcvSLRk33S4h8ZaMKep8RHYuK3PxkfnFd8TdD1yD+G+FgplcN9c+dtWlFDtfG5V7cPgodYmkd4pbPVkXsdwCvpMB8yh45O4dYgFL4dsE7PZcy9HwT1QNARw0rjmTKjedB4lPnVQGRW9kIba7zVxI= 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 1609586143126522.314662328167; Sat, 2 Jan 2021 03:15:43 -0800 (PST) Received: from localhost ([::1]:49240 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kvesn-0002RS-KY for importer@patchew.org; Sat, 02 Jan 2021 06:15:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33034) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kveqn-0000eK-92 for qemu-devel@nongnu.org; Sat, 02 Jan 2021 06:13:37 -0500 Received: from zero.eik.bme.hu ([152.66.115.2]:56421) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kveqj-00073S-EO for qemu-devel@nongnu.org; Sat, 02 Jan 2021 06:13:36 -0500 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 6BF2274763D; Sat, 2 Jan 2021 12:13:30 +0100 (CET) Received: by zero.eik.bme.hu (Postfix, from userid 432) id DB2E97470E2; Sat, 2 Jan 2021 12:13:29 +0100 (CET) Message-Id: <78db2ced4b41a8a775dbc6c97a90db683952c2cb.1609584216.git.balaton@eik.bme.hu> In-Reply-To: References: Subject: [PATCH 03/24] vt82c686b: Rename VT82C686B to VT82C686B_ISA Date: Sat, 02 Jan 2021 11:43:35 +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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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 This is really the ISA bridge part so name the type accordingly. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/isa/vt82c686.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 1be1169f83..d40599c7da 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -43,14 +43,14 @@ typedef struct SuperIOConfig { uint8_t data; } SuperIOConfig; =20 -struct VT82C686BState { +struct VT82C686BISAState { PCIDevice dev; MemoryRegion superio; SuperIOConfig superio_conf; }; =20 -#define TYPE_VT82C686B "VT82C686B" -OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BState, VT82C686B) +#define TYPE_VT82C686B_ISA "vt82c686b-isa" +OBJECT_DECLARE_SIMPLE_TYPE(VT82C686BISAState, VT82C686B_ISA) =20 static void superio_ioport_writeb(void *opaque, hwaddr addr, uint64_t data, unsigned size) @@ -117,7 +117,7 @@ static const MemoryRegionOps superio_ops =3D { =20 static void vt82c686b_isa_reset(DeviceState *dev) { - VT82C686BState *vt82c =3D VT82C686B(dev); + VT82C686BISAState *vt82c =3D VT82C686B_ISA(dev); uint8_t *pci_conf =3D vt82c->dev.config; =20 pci_set_long(pci_conf + PCI_CAPABILITY_LIST, 0x000000c0); @@ -146,7 +146,7 @@ static void vt82c686b_isa_reset(DeviceState *dev) static void vt82c686b_write_config(PCIDevice *d, uint32_t address, uint32_t val, int len) { - VT82C686BState *vt686 =3D VT82C686B(d); + VT82C686BISAState *vt686 =3D VT82C686B_ISA(d); =20 DPRINTF("vt82c686b_write_config address 0x%x val 0x%x len 0x%x\n", address, val, len); @@ -434,7 +434,7 @@ static const VMStateDescription vmstate_via =3D { .version_id =3D 1, .minimum_version_id =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_PCI_DEVICE(dev, VT82C686BState), + VMSTATE_PCI_DEVICE(dev, VT82C686BISAState), VMSTATE_END_OF_LIST() } }; @@ -442,7 +442,7 @@ static const VMStateDescription vmstate_via =3D { /* init the PCI-to-ISA bridge */ static void vt82c686b_realize(PCIDevice *d, Error **errp) { - VT82C686BState *vt82c =3D VT82C686B(d); + VT82C686BISAState *vt82c =3D VT82C686B_ISA(d); uint8_t *pci_conf; ISABus *isa_bus; uint8_t *wmask; @@ -479,7 +479,7 @@ ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) { PCIDevice *d; =20 - d =3D pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B= ); + d =3D pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B= _ISA); return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); } =20 @@ -505,9 +505,9 @@ static void via_class_init(ObjectClass *klass, void *da= ta) } =20 static const TypeInfo via_info =3D { - .name =3D TYPE_VT82C686B, + .name =3D TYPE_VT82C686B_ISA, .parent =3D TYPE_PCI_DEVICE, - .instance_size =3D sizeof(VT82C686BState), + .instance_size =3D sizeof(VT82C686BISAState), .class_init =3D via_class_init, .interfaces =3D (InterfaceInfo[]) { { INTERFACE_CONVENTIONAL_PCI_DEVICE }, --=20 2.21.3