From nobody Fri Apr 26 10:57:31 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1602873220; cv=none; d=zohomail.com; s=zohoarc; b=dUOqHOVtUJ1wquTwMoVTZHMY0IKOj18mk2HCRYhLRwbaQ0dy2oi+BeozND0aXmBfoahZ+U66bOI7FSdpICawKjAw7yxFB1kPLdIHW0nViUU4NN7BgqN84SMS14LZ6iHMhcZqljTYAujieitIXRWZDyCWCOuCx+Ss9LvUPTduL2E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602873220; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jYPjt8yqgnN3ou+ThPiQIBL0lr7T4IfAplcqfvOtmmI=; b=Z2EnEXev7NDJFX+HnrMlCKP/pfKkxb0CuU29nPG2NNJsHfw4jGeHam/fEf8BZnJjJcSlYpShSM5JKgXaTsXNL8sVo+RzidjoadJQJSMNjffGFL7I1tPuySQjqjboB2QOCijUCHjazrfd9q7CEV7ssWIijwby/yV4ZfIxYKTQcGw= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602873220729434.6615096650738; Fri, 16 Oct 2020 11:33:40 -0700 (PDT) Received: from localhost ([::1]:43394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTUXq-00029a-S3 for importer@patchew.org; Fri, 16 Oct 2020 14:33:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52116) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSN-0007pq-AX; Fri, 16 Oct 2020 14:27:59 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57606 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSL-0000FL-RI; Fri, 16 Oct 2020 14:27:59 -0400 Received: from host86-148-246-80.range86-148.btcentralplus.com ([86.148.246.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTUSI-0003wP-Ec; Fri, 16 Oct 2020 19:27:59 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, f4bug@amsat.org, hpoussin@reactos.org, qemu-ppc@nongnu.org, atar4qemu@gmail.com, david@gibson.dropbear.id.au Date: Fri, 16 Oct 2020 19:27:35 +0100 Message-Id: <20201016182739.22875-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> References: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.246.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 1/5] m48t59-isa: remove legacy m48t59_init_isa() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" This function is no longer used within the codebase. Signed-off-by: Mark Cave-Ayland Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59-isa.c | 25 ------------------------- include/hw/rtc/m48t59.h | 2 -- 2 files changed, 27 deletions(-) diff --git a/hw/rtc/m48t59-isa.c b/hw/rtc/m48t59-isa.c index cae315e488..dc21fb10a5 100644 --- a/hw/rtc/m48t59-isa.c +++ b/hw/rtc/m48t59-isa.c @@ -58,31 +58,6 @@ static M48txxInfo m48txx_isa_info[] =3D { } }; =20 -Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, - int base_year, int model) -{ - ISADevice *isa_dev; - DeviceState *dev; - int i; - - for (i =3D 0; i < ARRAY_SIZE(m48txx_isa_info); i++) { - if (m48txx_isa_info[i].size !=3D size || - m48txx_isa_info[i].model !=3D model) { - continue; - } - - isa_dev =3D isa_new(m48txx_isa_info[i].bus_name); - dev =3D DEVICE(isa_dev); - qdev_prop_set_uint32(dev, "iobase", io_base); - qdev_prop_set_int32(dev, "base-year", base_year); - isa_realize_and_unref(isa_dev, bus, &error_fatal); - return NVRAM(dev); - } - - assert(false); - return NULL; -} - static uint32_t m48txx_isa_read(Nvram *obj, uint32_t addr) { M48txxISAState *d =3D M48TXX_ISA(obj); diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h index 04abedf3b2..9defe578d1 100644 --- a/include/hw/rtc/m48t59.h +++ b/include/hw/rtc/m48t59.h @@ -47,8 +47,6 @@ struct NvramClass { void (*toggle_lock)(Nvram *obj, int lock); }; =20 -Nvram *m48t59_init_isa(ISABus *bus, uint32_t io_base, uint16_t size, - int base_year, int type); Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, uint32_t io_base, uint16_t size, int base_year, int type); --=20 2.20.1 From nobody Fri Apr 26 10:57:31 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1602873246; cv=none; d=zohomail.com; s=zohoarc; b=UqhjbmwyVIGc/9iLxlchT53+5MpGeEIQbCN+UAWeYEkdLSd1sxVgxSbvhoZoJwyKfQuFE0bOKzuQTn5yRR9wf2A9n8qVZjyHeuVS5IU0n6xLGbBkRXMy94HWYTys0W5zpK/2gSCm8VOYwyrr0IDvmasZCCCmCTqtDrLotm00uVE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602873246; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=SlPJy1IWFak8sxKNpyyhVF49PC6TEgd0OVQHufIQ8ZA=; b=I0XDipHIAXLh+/YQTuwK3nx7kDT+OZVJKHRsS04VY3DHMpP89vbUN+TKSTB5EhF0Tr/gouBzO82DkFQUUMO2Kg515rpmElmuFWEfvlY8qvG0WD77hfFOulEwpzinqGkWHAp/f4Yzc57BFqj5zO3L/shx1c4qslPhapPBwxBH/4U= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 160287324624766.00376496791625; Fri, 16 Oct 2020 11:34:06 -0700 (PDT) Received: from localhost ([::1]:43948 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTUYH-0002Oo-2f for importer@patchew.org; Fri, 16 Oct 2020 14:34:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52130) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSR-0007wP-1f; Fri, 16 Oct 2020 14:28:03 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57618 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSP-0000Fj-HV; Fri, 16 Oct 2020 14:28:02 -0400 Received: from host86-148-246-80.range86-148.btcentralplus.com ([86.148.246.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTUSN-0003wP-Bu; Fri, 16 Oct 2020 19:28:04 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, f4bug@amsat.org, hpoussin@reactos.org, qemu-ppc@nongnu.org, atar4qemu@gmail.com, david@gibson.dropbear.id.au Date: Fri, 16 Oct 2020 19:27:36 +0100 Message-Id: <20201016182739.22875-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> References: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.246.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 2/5] sun4m: use qdev properties instead of legacy m48t59_init() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 54a2b2f9ef..a9bb60f2b2 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -966,7 +966,13 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hw= def, create_unimplemented_device("SUNW,sx", hwdef->sx_base, 0x2000); } =20 - nvram =3D m48t59_init(slavio_irq[0], hwdef->nvram_base, 0, 0x2000, 196= 8, 8); + dev =3D qdev_new("sysbus-m48t08"); + qdev_prop_set_int32(dev, "base-year", 1968); + s =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + sysbus_connect_irq(s, 0, slavio_irq[0]); + sysbus_mmio_map(s, 0, hwdef->nvram_base); + nvram =3D NVRAM(dev); =20 slavio_timer_init_all(hwdef->counter_base, slavio_irq[19], slavio_cpu_= irq, smp_cpus); =20 --=20 2.20.1 From nobody Fri Apr 26 10:57:31 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1602873243; cv=none; d=zohomail.com; s=zohoarc; b=YKy4T2zMZ7JA3XDIJ7RzahMDquE3IV435+ywOBmIoBWjtS16UDdEPyWWX0noq3RxgUE1HA8s7b2nlIeIeJPHorH9OgvWJtozC3PLv2m+Avs/On8/qZo7ZYQVQimcXv+9rC5/3oMxM6AIu1u+ngxeCPgISkyhkpTLN6hJWUo51WE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602873243; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Vp/oxJEq2MvBBX0RMfC51K5Qk/mK+Gg+oggd9uoNiaQ=; b=loqoSJsqbbWvaI3+ovIAbP5IBZnVxAtQdHgn4EJiRk0kdu54mjg2V+14fMAKZtbucXDRQTohh3Vp5t67q2voiSqaokL06lpFSsezY6L1uTiaihK8O1r+iA/yiD57Nt4sj2QR9BDUiQXSXYmnAy0PrUWs4k0MKSElDwmrUhRCRak= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602873243116980.2339472233949; Fri, 16 Oct 2020 11:34:03 -0700 (PDT) Received: from localhost ([::1]:43648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTUYD-0002GI-Rg for importer@patchew.org; Fri, 16 Oct 2020 14:34:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52178) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSZ-00085D-0W; Fri, 16 Oct 2020 14:28:11 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57630 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSW-0000GK-Pp; Fri, 16 Oct 2020 14:28:10 -0400 Received: from host86-148-246-80.range86-148.btcentralplus.com ([86.148.246.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTUSS-0003wP-8s; Fri, 16 Oct 2020 19:28:09 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, f4bug@amsat.org, hpoussin@reactos.org, qemu-ppc@nongnu.org, atar4qemu@gmail.com, david@gibson.dropbear.id.au Date: Fri, 16 Oct 2020 19:27:37 +0100 Message-Id: <20201016182739.22875-4-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> References: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.246.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 3/5] sun4u: use qdev properties instead of legacy m48t59_init() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc64/sun4u.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index ad5ca2472a..05e659c8a4 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -671,10 +671,13 @@ static void sun4uv_init(MemoryRegion *address_space_m= em, pci_ide_create_devs(pci_dev); =20 /* Map NVRAM into I/O (ebus) space */ - nvram =3D m48t59_init(NULL, 0, 0, NVRAM_SIZE, 1968, 59); - s =3D SYS_BUS_DEVICE(nvram); + dev =3D qdev_new("sysbus-m48t59"); + qdev_prop_set_int32(dev, "base-year", 1968); + s =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); memory_region_add_subregion(pci_address_space_io(ebus), 0x2000, sysbus_mmio_get_region(s, 0)); + nvram =3D NVRAM(dev); =20 initrd_size =3D 0; initrd_addr =3D 0; --=20 2.20.1 From nobody Fri Apr 26 10:57:31 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1602873390; cv=none; d=zohomail.com; s=zohoarc; b=XULPR7tKinyliJZ+wFWMO4BzkmDBQPqzpOZ/x/PUmjblNnY6d0qXQBkLhpiZAtdBAlattxpuiQ6klIsB6qHtBckJ+tfJDanniF6DnwCE1QSBT6MbRA151XgrUzaNAweksNyzkslAzcrLArtUQpK+J2Qx5NgqT1X71ddGUwSf43M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602873390; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=FGQHsoZspQ3lNE5x3PMrDWtSCTO8LU6X32Ym5JCmgyI=; b=hIG526OUVmQPl+2ckAoPBLQL+IXZhK6cxV8pyNd4+jU3WE+X8HQfWAz1zVwuaQ7B5YyN8zdk9yy3g5h+yf34TKP/yvpYoJ5TUzpyfSKP2HLqnj+noK6j3U7luuAsi88eSwU+MDuYatzXjkEreW2Uwp06X7fkiWDB7JnN7UEK9QA= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602873390429847.5088313766196; Fri, 16 Oct 2020 11:36:30 -0700 (PDT) Received: from localhost ([::1]:50024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTUab-0005Gz-5S for importer@patchew.org; Fri, 16 Oct 2020 14:36:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52200) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSd-0008G9-Ji; Fri, 16 Oct 2020 14:28:15 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57642 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSb-0000Gy-UY; Fri, 16 Oct 2020 14:28:15 -0400 Received: from host86-148-246-80.range86-148.btcentralplus.com ([86.148.246.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTUSX-0003wP-7H; Fri, 16 Oct 2020 19:28:15 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, f4bug@amsat.org, hpoussin@reactos.org, qemu-ppc@nongnu.org, atar4qemu@gmail.com, david@gibson.dropbear.id.au Date: Fri, 16 Oct 2020 19:27:38 +0100 Message-Id: <20201016182739.22875-5-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> References: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.246.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 4/5] ppc405_boards: use qdev properties instead of legacy m48t59_init() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Signed-off-by: Mark Cave-Ayland Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/ppc405_boards.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index 6198ec1035..4687715b15 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -28,6 +28,8 @@ #include "qemu-common.h" #include "cpu.h" #include "hw/ppc/ppc.h" +#include "hw/qdev-properties.h" +#include "hw/sysbus.h" #include "ppc405.h" #include "hw/rtc/m48t59.h" #include "hw/block/flash.h" @@ -145,6 +147,8 @@ static void ref405ep_init(MachineState *machine) char *filename; ppc4xx_bd_info_t bd; CPUPPCState *env; + DeviceState *dev; + SysBusDevice *s; qemu_irq *pic; MemoryRegion *bios; MemoryRegion *sram =3D g_new(MemoryRegion, 1); @@ -227,7 +231,11 @@ static void ref405ep_init(MachineState *machine) /* Register FPGA */ ref405ep_fpga_init(sysmem, 0xF0300000); /* Register NVRAM */ - m48t59_init(NULL, 0xF0000000, 0, 8192, 1968, 8); + dev =3D qdev_new("sysbus-m48t08"); + qdev_prop_set_int32(dev, "base-year", 1968); + s =3D SYS_BUS_DEVICE(dev); + sysbus_realize_and_unref(s, &error_fatal); + sysbus_mmio_map(s, 0, 0xF0000000); /* Load kernel */ linux_boot =3D (kernel_filename !=3D NULL); if (linux_boot) { --=20 2.20.1 From nobody Fri Apr 26 10:57:31 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1602873435; cv=none; d=zohomail.com; s=zohoarc; b=B67s3eRkotCUVu8SMW1zir79Y6+x9QsgoGmd+oHau1t939DViG593ERA9vCrp+T2z8hUBNHmWTuJKgsKfn1ObqfMcdP6e2RxfYRSEI3LUvmHWp9Qhle0i8G21nytUbycLTdt8bGw0LYI+vjU1GnJUCpvZGUtbK6hjY80xQPAAEw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602873435; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=G61sZAw3Ow2LjK2pXedpcRvzovZAiTxCuQeDs0lVP/o=; b=ZXP/Y2oWCNeGN02CgXfwqk+Ek3bEWosZwf8tzbrXrheVrRG5Tbr4P2BVd3Cw/6RPCwbknc1Vgj7OE2gSJOSZcregUUL1uwMTTgAsY0EEaCYcRx4GeZWbKLXJM15kr4CN1wyHweIeon4XXv0Qiczw0tiAjF5NyLjBgMyPBUgR/eY= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602873435854440.83903024320216; Fri, 16 Oct 2020 11:37:15 -0700 (PDT) Received: from localhost ([::1]:50696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kTUbK-0005Y2-OU for importer@patchew.org; Fri, 16 Oct 2020 14:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52220) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSi-0008RF-Ea; Fri, 16 Oct 2020 14:28:20 -0400 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]:57652 helo=mail.default.ilande.uk0.bigv.io) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kTUSg-0000HV-Pt; Fri, 16 Oct 2020 14:28:20 -0400 Received: from host86-148-246-80.range86-148.btcentralplus.com ([86.148.246.80] helo=kentang.home) by mail.default.ilande.uk0.bigv.io with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kTUSd-0003wP-TC; Fri, 16 Oct 2020 19:28:20 +0100 From: Mark Cave-Ayland To: qemu-devel@nongnu.org, qemu-trivial@nongnu.org, f4bug@amsat.org, hpoussin@reactos.org, qemu-ppc@nongnu.org, atar4qemu@gmail.com, david@gibson.dropbear.id.au Date: Fri, 16 Oct 2020 19:27:39 +0100 Message-Id: <20201016182739.22875-6-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> References: <20201016182739.22875-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 86.148.246.80 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH 5/5] m48t59: remove legacy m48t59_init() function X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.default.ilande.uk0.bigv.io) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.default.ilande.uk0.bigv.io X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Now that all of the callers of this function have been switched to use qdev properties, this legacy init function can now be removed. Signed-off-by: Mark Cave-Ayland Reviewed-by: Herv=C3=A9 Poussineau Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/m48t59.c | 35 ----------------------------------- include/hw/rtc/m48t59.h | 4 ---- 2 files changed, 39 deletions(-) diff --git a/hw/rtc/m48t59.c b/hw/rtc/m48t59.c index 6525206976..d54929e861 100644 --- a/hw/rtc/m48t59.c +++ b/hw/rtc/m48t59.c @@ -564,41 +564,6 @@ const MemoryRegionOps m48t59_io_ops =3D { .endianness =3D DEVICE_LITTLE_ENDIAN, }; =20 -/* Initialisation routine */ -Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, - uint32_t io_base, uint16_t size, int base_year, - int model) -{ - DeviceState *dev; - SysBusDevice *s; - int i; - - for (i =3D 0; i < ARRAY_SIZE(m48txx_sysbus_info); i++) { - if (m48txx_sysbus_info[i].size !=3D size || - m48txx_sysbus_info[i].model !=3D model) { - continue; - } - - dev =3D qdev_new(m48txx_sysbus_info[i].bus_name); - qdev_prop_set_int32(dev, "base-year", base_year); - s =3D SYS_BUS_DEVICE(dev); - sysbus_realize_and_unref(s, &error_fatal); - sysbus_connect_irq(s, 0, IRQ); - if (io_base !=3D 0) { - memory_region_add_subregion(get_system_io(), io_base, - sysbus_mmio_get_region(s, 1)); - } - if (mem_base !=3D 0) { - sysbus_mmio_map(s, 0, mem_base); - } - - return NVRAM(s); - } - - assert(false); - return NULL; -} - void m48t59_realize_common(M48t59State *s, Error **errp) { s->buffer =3D g_malloc0(s->size); diff --git a/include/hw/rtc/m48t59.h b/include/hw/rtc/m48t59.h index 9defe578d1..d9b45eb161 100644 --- a/include/hw/rtc/m48t59.h +++ b/include/hw/rtc/m48t59.h @@ -47,8 +47,4 @@ struct NvramClass { void (*toggle_lock)(Nvram *obj, int lock); }; =20 -Nvram *m48t59_init(qemu_irq IRQ, hwaddr mem_base, - uint32_t io_base, uint16_t size, int base_year, - int type); - #endif /* HW_M48T59_H */ --=20 2.20.1