From nobody Tue Nov 18 11:49:29 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1609707088; cv=none; d=zohomail.com; s=zohoarc; b=R2f11YFHxtpYw8Hfc/AW2yUqvin/UTIxg0ksg4dLpoahPhQ2cN5a/UYAmTOuTkqF9YrXvvlN3+TQHnWtAQh+eWAuqeSuSGUbUHaCiT7M5AO6T1tfgsQunMl7iZV6RxXPkdh+dtHhjFcTWMKrA3BpiQ8SDh4jVVqO+GfDRqlp0Ms= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1609707088; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=O2gt3iQC5/uG1rR4b3ZU58jd9X7v2XF7iZC6cSzs7Hk=; b=eOwrHhl1QctcvAJGRRVZ8TQZYekFhfrDNmtyxB5pMzqEEYK/i4SckLM6o160CFo3c4EtJQ35OjKFI0aZ7cNFlPiEG0KDF/5eb2XeIfKq6ihUTqZGyfIEv738e/2igyrlcVWbhUAsQemFwhzwT5NNAYwcs935a7PKZLjPvhJaNwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 1609707088308791.5374447126816; Sun, 3 Jan 2021 12:51:28 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id e25so16674652wme.0 for ; Sun, 03 Jan 2021 12:51:27 -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 l8sm30138875wmf.35.2021.01.03.12.51.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jan 2021 12:51:25 -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=O2gt3iQC5/uG1rR4b3ZU58jd9X7v2XF7iZC6cSzs7Hk=; b=o7gC1ysL9YsWwSAyvJMzLQroh/sgbA+FhjxxKkrpxG1CfbLTz5A3aH26Fvt8DcsVpz EjSzUMStqLlTZE2Rn9tbS2WMVWtLWwoz/k7WUYQgFBK/vG9UNnk/VV8jXdxg8HCbmbxh +sNFHW+0DLNP3xR4/eAzi1mOYe0Z62zlD6BzAmKgGGoQ6hGxJyGkdVwD8o7KSYIWHjmC 9MIvZq3j/5iC2cw0/MGYbVsq6xnfIvXNJLRhNEl6+W68zCKINSy+O9PSMWzFzuglf4oT fJvoI4GC2GLeSqlviOs3xYcvWn0nHD2mGsALa+sFCc3MK6lW3b1r1zWG2t/xoz5sb8mj 0M3g== 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=O2gt3iQC5/uG1rR4b3ZU58jd9X7v2XF7iZC6cSzs7Hk=; b=i2duIGW3ZqFURZAi+dwvUjeNFtaJQcn2dyRRTaR+6CVLRp8wQ+vM2CaAyTPNMMg8k5 B6JEE5HKgN+P1TTrxYchwf6oVsOnzaGEZjht+lEl0y5HXPMIDL0wqqwkUtm5hgNfuNQB NHXf4+EjEwoL8NzNluyNiBX8mC+kNGDqDmfwfE1xApjgFGLaTR3F7v4ykWffu6Ftu7aB VcTv2nhFLL4378oFWDLIi+hfiy3Te+ehl3zumeqVX5f816ru6XwCx6GBQJTxi2/2NZxT DNA6CqHcXU1HXJuvFJJu2W/XL0yVqA71/5tRo/XyaHwKJ2+1bVMhSzRCHQ9MeFQtcuNO MLxg== X-Gm-Message-State: AOAM532+cwqalFYHtY/o3eDSgGzi15el38vBvusGCLB/LHwLVORgESlZ eASGfqXFaNNttNpUsr6t1ZQ= X-Google-Smtp-Source: ABdhPJxKLGCJBhoScMbmykwz0K2/+IEs5YmogdUwphwyerumyTrByy1CPMwzEsCX4ohX0UlKNtjyNQ== X-Received: by 2002:a05:600c:2106:: with SMTP id u6mr24436020wml.4.1609707086496; Sun, 03 Jan 2021 12:51:26 -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 13/35] vt82c686: Remove legacy vt82c686b_isa_init() function Date: Sun, 3 Jan 2021 21:49:59 +0100 Message-Id: <20210103205021.2837760-14-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 Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <58d7585f979f154b1f1e69fdc026eed6dbc7996f.1609584216.git.balato= n@eik.bme.hu> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/isa/vt82c686.h | 3 +-- hw/isa/vt82c686.c | 9 --------- hw/mips/fuloong2e.c | 4 +++- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/hw/isa/vt82c686.h b/include/hw/isa/vt82c686.h index ff80a926dcb..8d2d276fe16 100644 --- a/include/hw/isa/vt82c686.h +++ b/include/hw/isa/vt82c686.h @@ -1,13 +1,12 @@ #ifndef HW_VT82C686_H #define HW_VT82C686_H =20 - +#define TYPE_VT82C686B_ISA "vt82c686b-isa" #define TYPE_VT82C686B_SUPERIO "vt82c686b-superio" #define TYPE_VIA_AC97 "via-ac97" #define TYPE_VIA_MC97 "via-mc97" =20 /* vt82c686.c */ -ISABus *vt82c686b_isa_init(PCIBus * bus, int devfn); I2CBus *vt82c686b_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq); =20 diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c index 9567326d8e2..2912c253dca 100644 --- a/hw/isa/vt82c686.c +++ b/hw/isa/vt82c686.c @@ -49,7 +49,6 @@ struct VT82C686BISAState { SuperIOConfig superio_conf; }; =20 -#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, @@ -367,14 +366,6 @@ static void vt82c686b_realize(PCIDevice *d, Error **er= rp) &vt82c->superio); } =20 -ISABus *vt82c686b_isa_init(PCIBus *bus, int devfn) -{ - PCIDevice *d; - - d =3D pci_create_simple_multifunction(bus, devfn, true, TYPE_VT82C686B= _ISA); - return ISA_BUS(qdev_get_child_bus(DEVICE(d), "isa.0")); -} - static void via_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index 8287e65c52c..435f0e5be5b 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -240,7 +240,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus,= int slot, qemu_irq intc, ISABus *isa_bus; PCIDevice *dev; =20 - isa_bus =3D vt82c686b_isa_init(pci_bus, PCI_DEVFN(slot, 0)); + dev =3D pci_create_simple_multifunction(pci_bus, PCI_DEVFN(slot, 0), t= rue, + TYPE_VT82C686B_ISA); + isa_bus =3D ISA_BUS(qdev_get_child_bus(DEVICE(dev), "isa.0")); assert(isa_bus); *p_isa_bus =3D isa_bus; /* Interrupt controller */ --=20 2.26.2