starred/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2026-07-08 17:46:10 +00:00
Code Issues 380 Packages Projects Releases Wiki Activity

hw/intc/exynos4210_combiner: Avoid hw_error for guest errors

Browse Source 
In the exynos4210_combiner device, several cases of bad register
offsets passed by the guest are handled by calling hw_error().  This
causes QEMU to abort with a guest register dump.  These days we
prefer to handle "guest does something wrong" by logging it and
continuing.

Update the hw_error() calls to qemu_log_mask(LOG_GUEST_ERROR).

Resolves: https://gitlab.com/qemu-project/qemu/-/work_items/3396
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20260529143624.158935-2-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
2026-05-29 15:36:23 +01:00
parent 39db8a2f79
commit b6d36a1af7
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
hw/intc/exynos4210_combiner.c
View File

@@ -28,12 +28,12 @@
*/
#include "qemu/osdep.h"
#include "qemu/log.h"
#include "hw/core/sysbus.h"
#include "migration/vmstate.h"
#include "qemu/module.h"
#include "hw/intc/exynos4210_combiner.h"
#include "hw/arm/exynos4210.h"
#include "hw/core/hw-error.h"
#include "hw/core/irq.h"
#include "hw/core/qdev-properties.h"
#include "qom/object.h"
@@ -119,8 +119,10 @@ exynos4210_combiner_read(void *opaque, hwaddr offset, unsigned size)
break;
default:
if (offset >> 2 >= IIC_REGSET_SIZE) {
hw_error("exynos4210.combiner: overflow of reg_set by 0x"
HWADDR_FMT_plx "offset\n", offset);
qemu_log_mask(LOG_GUEST_ERROR,
"exynos4210.combiner: overflow of reg_set by 0x"
HWADDR_FMT_plx "offset\n", offset);
return 0;
}
val = s->reg_set[offset >> 2];
}
@@ -183,20 +185,24 @@ static void exynos4210_combiner_write(void *opaque, hwaddr offset,
reg_n = (offset - (req_quad_base_n << 4)) >> 2;
if (req_quad_base_n >= IIC_NGRP) {
hw_error("exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
qemu_log_mask(LOG_GUEST_ERROR,
"exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
return;
}
if (reg_n > 1) {
hw_error("exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
qemu_log_mask(LOG_GUEST_ERROR,
"exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
return;
}
if (offset >> 2 >= IIC_REGSET_SIZE) {
hw_error("exynos4210.combiner: overflow of reg_set by 0x"
HWADDR_FMT_plx "offset\n", offset);
qemu_log_mask(LOG_GUEST_ERROR,
"exynos4210.combiner: overflow of reg_set by 0x"
HWADDR_FMT_plx "offset\n", offset);
return;
}
s->reg_set[offset >> 2] = val;
@@ -245,8 +251,9 @@ static void exynos4210_combiner_write(void *opaque, hwaddr offset,
exynos4210_combiner_update(s, grp_quad_base_n + 3);
break;
default:
hw_error("exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
qemu_log_mask(LOG_GUEST_ERROR,
"exynos4210.combiner: unallowed write access at offset 0x"
HWADDR_FMT_plx "\n", offset);
break;
}
}