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.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1609707069; cv=none; d=zohomail.com; s=zohoarc; b=cwrKIwPXKe27yO81/TIffhRBasfRF/dS6UOjo/uY8Tkuz9vQIPuEB4vQ/llxROsGIsI1hmkZcwLXxnV6chZ6AyFdBQS/wZqdkd1srPxD7QsZgVtL9oKqI1s6ncl7yRPnZsuzwGF9BYesio0oB1InIhOy/JJEcnwiLnb6S0LXOy0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707069; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5g7GkiOKARu3D5h6eCdOE8BcvARihXVaPU6R8h4tuJw=; b=Pl4oR2VUEwZvQAGBaydZoROuDXC3/s5mRpCTA+wVS5AA5YW0j2aTflHLB5TVs2KVIDHdU9i+AkcazszS2eCAzDJagonMKRlWMmMnXGWraF0C/Uy3+fj+Fk4Hv0kKPCY6deJEabrZCe3az2C5OjmJjms426ruvfcmcfBsKjKaGyE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1609707069438295.2564457687711; Sun, 3 Jan 2021 12:51:09 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id c133so15940282wme.4 for ; Sun, 03 Jan 2021 12:51:08 -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 i16sm83595108wrx.89.2021.01.03.12.51.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:07 -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=5g7GkiOKARu3D5h6eCdOE8BcvARihXVaPU6R8h4tuJw=; b=vfyTkT2yQUs/d1NSyDVupvQkFdgTwxYYvA8tp5G+gDekxBl1koDe8QTfOFfUG/jfKu 5q4DafXdV1nPCciuEde4Ve8FPZYidUlMlQ0RvQgTYEFZtDIEKJFGUy9QBkeSUHoL5fhS if85ZdA7/tfdwqsE3k8DxgN4dKZdTQQELdHer7FYHh5F29fFfbcqA/sSDRJtS9goqPKr BkeOk605qfRvjb1JuOfGYGsRr8qLSeYoLAZrn23lOn0UJ1yyW+2K+Xg4ENi08/myRp/V 8Yth5K68ShgW2IueMM30YzhlN0op+k0pK/y8n6j3ir/z/JCXn5SNnj13pcjeSQjEf/3S 8s4Q== 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=5g7GkiOKARu3D5h6eCdOE8BcvARihXVaPU6R8h4tuJw=; b=mkuT4xZ+mhx42j+g9vRJyEde+WJq+H2/ByGjI5vDA9Dh/TX8jG32uIXlpAauGed4T2 oSU359UQhyWEjmBLcORaz42hDaGxkMS/BuKkcQHAPqBwdyT4K2WOSUPQ2WCOLBOgVKOM oP0N9x7WjBC9WtmyFwyF4feIHQZIXkoFreFwiLoBZu3ehZe3ZJovkwhGcQJLYkBk4dtx UoGjnckiGIkIA08+Ur+6DgEZ0pPrDrx0idfzJKKL2gdfxxT8hDUNq5dWOEwfn6LnrPEn fsWEWCDvjetZBX/BgvPKZwFtagBsXBYJB4GdiZhySswgytJm9L0WkR/dppRaP3ZeMjKE 8iGQ== X-Gm-Message-State: AOAM533KDyA6/Mywj46MLvwNxNo3DPbbGBEuKbY1f4LV6Oz7IM1qgPO+ axFJqYd5QrpDEso+zqtPsqE= X-Google-Smtp-Source: ABdhPJwvul11hlBm4oe5zg4/zPiAQAs4HR+6cU9/d3J6tWzv4ZsWWlMBlPnGB+szm7GUjVS61KB1Tw== X-Received: by 2002:a1c:e0d4:: with SMTP id x203mr24716466wmg.68.1609707067663; Sun, 03 Jan 2021 12:51:07 -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 09/35] vt82c686: Rename VT82C686B to VT82C686B_ISA Date: Sun, 3 Jan 2021 21:49:55 +0100 Message-Id: <20210103205021.2837760-10-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 This is really the ISA bridge part so name the type accordingly. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <78db2ced4b41a8a775dbc6c97a90db683952c2cb.1609584216.git.balato= n@eik.bme.hu> Signed-off-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 1be1169f83a..d40599c7daa 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.26.2