From nobody Mon Feb 9 12:29:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) client-ip=209.85.221.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619221021; cv=none; d=zohomail.com; s=zohoarc; b=TuRul2i5ROKHWPwS3QkWwhfP0LKBL9Jw5wE0gRbWpuvqt+wbPXBUR30vK0kIfDWqv502q4NopR+eNxFbOVEnBaLEj5hTSm9uNihNc1YcMh+lVPzw7VhatyfSQXXpvjJ+kw43oGr036BEJptrA1VvQXp27slszUkt4eBuIqcHWbs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619221021; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=6keiDYxRsK177SqD7A1GjGUaf153R9oEf+ny0xc/KZ4=; b=HX1uGZ/4HP4dL462tfhMQuyRZ+Cw72fdXMo9qrMP4ZT5FSC4xvgJccqIBdtcxeowr4d/4dpL+klNTP7ysl49IG4C0074pnWo7B46wFRmiSrDT35tdw0URRlg29hZ0zXXekl/OpICTRRE1EfdiBfAHx0RAKEjit8JooEcTm45kKo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.zohomail.com with SMTPS id 1619221021114526.7462150391323; Fri, 23 Apr 2021 16:37:01 -0700 (PDT) Received: by mail-wr1-f49.google.com with SMTP id m9so37113014wrx.3 for ; Fri, 23 Apr 2021 16:37:00 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id f7sm10939291wrp.48.2021.04.23.16.36.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 16:36:58 -0700 (PDT) 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=6keiDYxRsK177SqD7A1GjGUaf153R9oEf+ny0xc/KZ4=; b=PDnvZeRzJ++nk1KhV2qdWzhCrpjPHLVxjkzgBEEundw/P5bZ4III/mrZ+xbUsDoZ7B lZ7OO2Yhp2w1dt//J4vyaRQTWW/ySOoRMMqrBvLyClWJxBXNZYQynfB69a22ZQhQvgxi pryH8vZ+nD0atc8TwQcTI0q5EhXCE5PgK/sECtz+fsaf4+pdsxZhXpPCqKDQwJJH+CgF vtix9mpDhsZGOgoF03mpc/99TE34ZvV68yDJkXwgTWI7e9UpqI7l90UGHebo/oDsqZNV C3x7328cIeh2x6mn9MuwsXNSzPGNDGhM/9DApZIA0IFjsTCYA137mWU5ARVZb4QW9UAZ tNjA== 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=6keiDYxRsK177SqD7A1GjGUaf153R9oEf+ny0xc/KZ4=; b=XCdwNjNC7Oocm9KrkXJZCULuecPrYJ6WSDr4uS3yla0ff/8PTxWECmy6KiWkIyUgIg RhSRl4VhKo+Zz5DZXLwcQZ7TwqjLSGiaE/ojXbdgCqQEhHjPRlNWH3LrWAqhu+OoOu1v 8gn4gaGQm1zHgFj5NrU/DtfyED7MOaAd6Wto49kFKlg9g829Dve7iBUjEzg4r+czN6sg XNDVGzbSvsGZTwAA02nteRN6cr3ku1nzsChDRHsYOUV3j15yRVo8QVbQnFmWdfFr7vzZ pHxHqq+W+A7Ez5fzcOjQWg7u0cPNKw3RQaunSzbN3Fxof/i/lqSF2l+vqDjffK45RMVy Sk8Q== X-Gm-Message-State: AOAM530N8akiXWPsd+ygEfvXX+wKPh7Yutw+K0nHf1l2UkmFQIzYaONI 9tkkbWVvO03llgt8iB6UCborHRSIgLWRTQ== X-Google-Smtp-Source: ABdhPJwcCkSc2aXs5CoedqFxTqyTyZ7O1RwkE/wjfo+0YVEnpaMQhxuIJWvlOwOQXf7C5x9GbvVhKg== X-Received: by 2002:a5d:55cd:: with SMTP id i13mr7512868wrw.393.1619221019431; Fri, 23 Apr 2021 16:36:59 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Edgar E. Iglesias" , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 1/2] hw/timer/etraxfs_timer: Qdev'ify reset() Date: Sat, 24 Apr 2021 01:36:51 +0200 Message-Id: <20210423233652.3042941-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210423233652.3042941-1-f4bug@amsat.org> References: <20210423233652.3042941-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) TYPE_ETRAX_FS_TIMER is a sysbus device, so its DeviceClass::reset() handler is called automatically when its qbus parent is reset. Convert the generic reset to a qdev one, and remove the qemu_register_reset() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- hw/timer/etraxfs_timer.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/timer/etraxfs_timer.c b/hw/timer/etraxfs_timer.c index 5379006086f..3cfab3e3284 100644 --- a/hw/timer/etraxfs_timer.c +++ b/hw/timer/etraxfs_timer.c @@ -309,9 +309,9 @@ static const MemoryRegionOps timer_ops =3D { } }; =20 -static void etraxfs_timer_reset(void *opaque) +static void etraxfs_timer_reset(DeviceState *dev) { - ETRAXTimerState *t =3D opaque; + ETRAXTimerState *t =3D ETRAX_TIMER(dev); =20 ptimer_transaction_begin(t->ptimer_t0); ptimer_stop(t->ptimer_t0); @@ -343,7 +343,6 @@ static void etraxfs_timer_realize(DeviceState *dev, Err= or **errp) memory_region_init_io(&t->mmio, OBJECT(t), &timer_ops, t, "etraxfs-timer", 0x5c); sysbus_init_mmio(sbd, &t->mmio); - qemu_register_reset(etraxfs_timer_reset, t); } =20 static void etraxfs_timer_class_init(ObjectClass *klass, void *data) @@ -351,6 +350,7 @@ static void etraxfs_timer_class_init(ObjectClass *klass= , void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D etraxfs_timer_realize; + dc->reset =3D etraxfs_timer_reset; } =20 static const TypeInfo etraxfs_timer_info =3D { --=20 2.26.3 From nobody Mon Feb 9 12:29:09 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) client-ip=209.85.221.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1619221026; cv=none; d=zohomail.com; s=zohoarc; b=QAQy1iLY4HJLo9hsIXsI6KERNKVrISY6yRDQ5Pf3tpD7IDWGGzgxGSUfXn1+imvhp3xyvstr6qHFPqbL5F8UGbLBYKLblI16j6aXrea+L0cBBGpiw6SAN0spPQ1gZ3zP/0W8f683rlqlqtVQSpvOTDf8abPDk56QkZhSfanHE7s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619221026; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oXtiyIQkCO8DxortvAo+V9Aj7SVkgMJYsUxCMH52wCs=; b=X4Q/9PB9OEty82WQAnk8lVBpqvx/1pr/HdT++CpXAVft//g7vrpzfpBxjr00TWsW/ifzyjc6UtgwRyY3kN+WU0fRv3nKg2HQG+UdttEDmx3gRr1V1ybq9JWmS6JozIYC4PucdebshwDfirW4WLJ0Ddt1VOlpgub5wH0Gn74Cq7c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.zohomail.com with SMTPS id 1619221026075786.1375661562859; Fri, 23 Apr 2021 16:37:06 -0700 (PDT) Received: by mail-wr1-f47.google.com with SMTP id e7so40881929wrs.11 for ; Fri, 23 Apr 2021 16:37:05 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.redhat.com (39.red-81-40-121.staticip.rima-tde.net. [81.40.121.39]) by smtp.gmail.com with ESMTPSA id u9sm9514035wmc.38.2021.04.23.16.37.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Apr 2021 16:37:03 -0700 (PDT) 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=oXtiyIQkCO8DxortvAo+V9Aj7SVkgMJYsUxCMH52wCs=; b=jv+VRfvZUhBnpJTBeeLznRttupVWrlECaC6n7LgyfOQcUaY8t7LGetWmzYb/1S4gqC hTuXHcPGf3FKNUft+OO1h6gMlwrcI09n0YWqskFRYNlsy/KPFDSyjHs0gE6ukOediKMr jblo1B4tIiJRlUVhBZRGBWNvleeYjhyyLGxvycx8M+5tIhy0mTAyUFvS1n/stjdy6r+U fd5uM1VyDREa+rpRFIYX2iUcadLS1M95zjhS9cI9eVVwY3QZzWSj2vWUUqUYmDsxoLYw ELxOvIpq/q6Y6shjXlLu8wVrOyMDCN/Br4HqXGwqBuFeB3b6RfBGtWERbd63vbnA3/Fs Jukg== 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=oXtiyIQkCO8DxortvAo+V9Aj7SVkgMJYsUxCMH52wCs=; b=OKryAmz7UB0Ixwom3jivEqEjXXunurA/K/vW1xiICiCNZLEGx7i+Taz5wVns4Cz2b+ wCU9htpLLalc0zJYD0f9EpHiX0E7a6vR8QpMT9bugz7OOc2RshqEum22RZfeXTynKN0U 9bFkN5Sjci8AJmlIekqQl3xxof0Kr1U6uClQYbIzlYSOMpLYuKrflk1dbPp4A6i/SXTK TbP880DksDjk2S7VPUREtgmpri9j9bcRzJII7Pm1cZUyI4T3OPwat3Lbq7EM/v1Jz1fa VyEG7ULrdMxfsekSkgfJL4C9pM+pNgQ74M6nU3OE/QONuqRhbywC4xzS2XIlD0PFbZfP 9Xew== X-Gm-Message-State: AOAM5301nPsSOfIv/D+lnSrX3GC/JxcdyR4TGWk8mVFvNTHpubE+LpRa ulyABNaHjFUu1oy594KCF78= X-Google-Smtp-Source: ABdhPJxrMmmh0ioykZVerL75uE4P5wwgPKgGaUOt13ZznflJtHcooYKLd3ovxMsX8IZZChKuIbU8Ww== X-Received: by 2002:a5d:460b:: with SMTP id t11mr7681781wrq.310.1619221024310; Fri, 23 Apr 2021 16:37:04 -0700 (PDT) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, "Edgar E. Iglesias" , "Michael S. Tsirkin" , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 2/2] hw/rtc/mc146818rtc: Qdev'ify reset() Date: Sat, 24 Apr 2021 01:36:52 +0200 Message-Id: <20210423233652.3042941-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210423233652.3042941-1-f4bug@amsat.org> References: <20210423233652.3042941-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) TYPE_MC146818_RTC is an ISA device, so its DeviceClass::reset() handler is called automatically when its qbus parent is reset. We have 2 reset() methods: a generic one and the qdev one. Merge them into the qdev reset handler, rename it, and remove the qemu_register_reset() call. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/rtc/mc146818rtc.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/hw/rtc/mc146818rtc.c b/hw/rtc/mc146818rtc.c index 5d0fcacd0c0..710adeb9aaa 100644 --- a/hw/rtc/mc146818rtc.c +++ b/hw/rtc/mc146818rtc.c @@ -872,22 +872,6 @@ static void rtc_notify_suspend(Notifier *notifier, voi= d *data) rtc_set_memory(ISA_DEVICE(s), 0xF, 0xFE); } =20 -static void rtc_reset(void *opaque) -{ - RTCState *s =3D opaque; - - s->cmos_data[RTC_REG_B] &=3D ~(REG_B_PIE | REG_B_AIE | REG_B_SQWE); - s->cmos_data[RTC_REG_C] &=3D ~(REG_C_UF | REG_C_IRQF | REG_C_PF | REG_= C_AF); - check_update_timer(s); - - qemu_irq_lower(s->irq); - - if (s->lost_tick_policy =3D=3D LOST_TICK_POLICY_SLEW) { - s->irq_coalesced =3D 0; - s->irq_reinject_on_ack_count =3D 0; - } -} - static const MemoryRegionOps cmos_ops =3D { .read =3D cmos_ioport_read, .write =3D cmos_ioport_write, @@ -962,7 +946,6 @@ static void rtc_realizefn(DeviceState *dev, Error **err= p) memory_region_add_coalescing(&s->coalesced_io, 0, 1); =20 qdev_set_legacy_instance_id(dev, RTC_ISA_BASE, 3); - qemu_register_reset(rtc_reset, s); =20 object_property_add_tm(OBJECT(s), "date", rtc_get_date); =20 @@ -998,17 +981,29 @@ static Property mc146818rtc_properties[] =3D { DEFINE_PROP_END_OF_LIST(), }; =20 -static void rtc_resetdev(DeviceState *d) +static void rtc_reset(DeviceState *dev) { - RTCState *s =3D MC146818_RTC(d); + RTCState *s =3D MC146818_RTC(dev); =20 /* Reason: VM do suspend self will set 0xfe * Reset any values other than 0xfe(Guest suspend case) */ if (s->cmos_data[0x0f] !=3D 0xfe) { s->cmos_data[0x0f] =3D 0x00; } + + s->cmos_data[RTC_REG_B] &=3D ~(REG_B_PIE | REG_B_AIE | REG_B_SQWE); + s->cmos_data[RTC_REG_C] &=3D ~(REG_C_UF | REG_C_IRQF | REG_C_PF | REG_= C_AF); + check_update_timer(s); + + qemu_irq_lower(s->irq); + + if (s->lost_tick_policy =3D=3D LOST_TICK_POLICY_SLEW) { + s->irq_coalesced =3D 0; + s->irq_reinject_on_ack_count =3D 0; + } } =20 + static void rtc_build_aml(ISADevice *isadev, Aml *scope) { Aml *dev; @@ -1036,7 +1031,7 @@ static void rtc_class_initfn(ObjectClass *klass, void= *data) ISADeviceClass *isa =3D ISA_DEVICE_CLASS(klass); =20 dc->realize =3D rtc_realizefn; - dc->reset =3D rtc_resetdev; + dc->reset =3D rtc_reset; dc->vmsd =3D &vmstate_rtc; isa->build_aml =3D rtc_build_aml; device_class_set_props(dc, mc146818rtc_properties); --=20 2.26.3