ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/timer/a9gtimer: Handle QTest mode in a9_gtimer_get_current_cpu 

This commit updates the a9_gtimer_get_current_cpu() function to handle
cases where QTest is enabled. When QTest is used, it returns 0 instead
of dereferencing the current_cpu, which can be NULL. This prevents the
program from crashing during QTest runs.

Reproducer:
cat << EOF | qemu-system-aarch64 -display \
none -machine accel=qtest, -m 512M -machine npcm750-evb -qtest stdio
writel 0xf03fe20c 0x26d7468c
EOF

Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20240618144009.3137806-1-zheyuma97@gmail.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Zheyu Ma 2024-06-18 16:40:09 +02:00 committed by Peter Maydell
parent 5d173f30f6
commit ff8aff01fa
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/timer/a9gtimer.c
View File

@ -32,6 +32,7 @@
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/core/cpu.h" #include "hw/core/cpu.h"
#include "sysemu/qtest.h"
#ifndef A9_GTIMER_ERR_DEBUG #ifndef A9_GTIMER_ERR_DEBUG
#define A9_GTIMER_ERR_DEBUG 0 #define A9_GTIMER_ERR_DEBUG 0
@ -48,6 +49,10 @@
static inline int a9_gtimer_get_current_cpu(A9GTimerState *s) static inline int a9_gtimer_get_current_cpu(A9GTimerState *s)
{ {
if (qtest_enabled()) {
return 0;
}
if (current_cpu->cpu_index >= s->num_cpu) { if (current_cpu->cpu_index >= s->num_cpu) {
hw_error("a9gtimer: num-cpu %d but this cpu is %d!\n", hw_error("a9gtimer: num-cpu %d but this cpu is %d!\n",
s->num_cpu, current_cpu->cpu_index); s->num_cpu, current_cpu->cpu_index);