[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/45] misc: pxa2xx_timer: replace qemu_system_reset_request() cal
From: |
Peter Maydell |
Subject: |
[PULL 05/45] misc: pxa2xx_timer: replace qemu_system_reset_request() call with watchdog_perform_action() |
Date: |
Tue, 27 Feb 2024 13:32:34 +0000 |
From: Abhiram Tilak <atp.exp@gmail.com>
A few watchdog devices use qemu_system_reset_request(). This is not ideal since
behaviour of watchdog-expiry can't be changed by QMP using `watchdog_action`.
As stated in BiteSizedTasks wiki page, instead of using
qemu_system_reset_request()
to reset when a watchdog timer expires, let watchdog_perform_action() decide
what to do.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2124
Signed-off-by: Abhiram Tilak <atp.exp@gmail.com>
Message-id: 20240216192612.30838-5-atp.exp@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/timer/pxa2xx_timer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/hw/timer/pxa2xx_timer.c b/hw/timer/pxa2xx_timer.c
index 6a7d5551f43..6479ab1a8b3 100644
--- a/hw/timer/pxa2xx_timer.c
+++ b/hw/timer/pxa2xx_timer.c
@@ -18,6 +18,7 @@
#include "qemu/log.h"
#include "qemu/module.h"
#include "qom/object.h"
+#include "sysemu/watchdog.h"
#define OSMR0 0x00
#define OSMR1 0x04
@@ -417,7 +418,7 @@ static void pxa2xx_timer_tick(void *opaque)
if (t->num == 3)
if (i->reset3 & 1) {
i->reset3 = 0;
- qemu_system_reset_request(SHUTDOWN_CAUSE_GUEST_RESET);
+ watchdog_perform_action();
}
}
--
2.34.1
- [PULL 13/45] system/bootdevice: Don't unregister reset handler in restore_boot_order(), (continued)
- [PULL 13/45] system/bootdevice: Don't unregister reset handler in restore_boot_order(), Peter Maydell, 2024/02/27
- [PULL 21/45] hw/arm/bcm2836: Split out common part of BCM283X classes, Peter Maydell, 2024/02/27
- [PULL 25/45] hw/arm/bcm2838: Add GIC-400 to BCM2838 SoC, Peter Maydell, 2024/02/27
- [PULL 24/45] hw/arm: Introduce BCM2838 SoC, Peter Maydell, 2024/02/27
- [PULL 20/45] docs/devel/reset: Update to discuss system reset, Peter Maydell, 2024/02/27
- [PULL 30/45] hw/arm: Introduce Raspberry PI 4 machine, Peter Maydell, 2024/02/27
- [PULL 35/45] tests/qtest: Add bcm2838 mailbox test stub, Peter Maydell, 2024/02/27
- [PULL 22/45] hw/arm/bcm2853_peripherals: Split out common part of peripherals, Peter Maydell, 2024/02/27
- [PULL 39/45] tests/qtest/bcm2828-mailbox: Add mailbox tests tags. Part 3, Peter Maydell, 2024/02/27
- [PULL 09/45] pl031: Update last RTCLR value on write in case it's read back, Peter Maydell, 2024/02/27
- [PULL 05/45] misc: pxa2xx_timer: replace qemu_system_reset_request() call with watchdog_perform_action(),
Peter Maydell <=
- [PULL 19/45] hw/core/machine: Use qemu_register_resettable for sysbus reset, Peter Maydell, 2024/02/27
- [PULL 28/45] hw/gpio: Connect SD controller to BCM2838 GPIO, Peter Maydell, 2024/02/27
- [PULL 14/45] include/qom/object.h: New OBJECT_DEFINE_SIMPLE_TYPE{, _WITH_INTERFACES} macros, Peter Maydell, 2024/02/27
- [PULL 16/45] hw/core: Add ResetContainer which holds objects implementing Resettable, Peter Maydell, 2024/02/27
- [PULL 31/45] hw/arm/raspi4b: Temporarily disable unimplemented rpi4b devices, Peter Maydell, 2024/02/27
- [PULL 29/45] hw/arm: Add GPIO and SD to BCM2838 periph, Peter Maydell, 2024/02/27
- [PULL 36/45] tests/qtest/bcm2828-mailbox: Add mailbox test constants, Peter Maydell, 2024/02/27
- [PULL 34/45] tests/avocado/boot_linux_console.py: Add Rpi4b boot tests, Peter Maydell, 2024/02/27
- [PULL 23/45] hw/arm/raspi: Split out raspi machine common part, Peter Maydell, 2024/02/27
- [PULL 44/45] tests/qtest/bcm2828-mailbox: Append added properties to mailbox test, Peter Maydell, 2024/02/27