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

hw/arm/integratorcp: Replace hw_error() by qemu_log_mask() 

hw_error() calls exit(). This a bit overkill when we can log
the accesses as unimplemented or guest error.

When fuzzing the devices, we don't want the whole process to
exit. Replace some hw_error() calls by qemu_log_mask().

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200518140309.5220-2-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-18 16:03:06 +02:00 committed by Peter Maydell
parent c4947e64ef
commit 9904625f1b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/arm/integratorcp.c
View File

@ -20,6 +20,7 @@
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysemu/runstate.h" #include "sysemu/runstate.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "qemu/log.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "hw/char/pl011.h" #include "hw/char/pl011.h"
#include "hw/hw.h" #include "hw/hw.h"
@ -144,8 +145,9 @@ static uint64_t integratorcm_read(void *opaque, hwaddr offset,
/* ??? Voltage control unimplemented. */ /* ??? Voltage control unimplemented. */
return 0; return 0;
default: default:
hw_error("integratorcm_read: Unimplemented offset 0x%x\n", qemu_log_mask(LOG_UNIMP,
(int)offset); "%s: Unimplemented offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
return 0; return 0;
} }
} }
@ -252,8 +254,9 @@ static void integratorcm_write(void *opaque, hwaddr offset,
/* ??? Voltage control unimplemented. */ /* ??? Voltage control unimplemented. */
break; break;
default: default:
hw_error("integratorcm_write: Unimplemented offset 0x%x\n", qemu_log_mask(LOG_UNIMP,
(int)offset); "%s: Unimplemented offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
break; break;
} }
} }
@ -394,7 +397,8 @@ static uint64_t icp_pic_read(void *opaque, hwaddr offset,
case 5: /* INT_SOFTCLR */ case 5: /* INT_SOFTCLR */
case 11: /* FRQ_ENABLECLR */ case 11: /* FRQ_ENABLECLR */
default: default:
printf ("icp_pic_read: Bad register offset 0x%x\n", (int)offset); qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
return 0; return 0;
} }
} }
@ -430,7 +434,8 @@ static void icp_pic_write(void *opaque, hwaddr offset,
case 8: /* FRQ_STATUS */ case 8: /* FRQ_STATUS */
case 9: /* FRQ_RAWSTAT */ case 9: /* FRQ_RAWSTAT */
default: default:
printf ("icp_pic_write: Bad register offset 0x%x\n", (int)offset); qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
return; return;
} }
icp_pic_update(s); icp_pic_update(s);
@ -504,7 +509,8 @@ static uint64_t icp_control_read(void *opaque, hwaddr offset,
case 3: /* CP_DECODE */ case 3: /* CP_DECODE */
return 0x11; return 0x11;
default: default:
hw_error("icp_control_read: Bad offset %x\n", (int)offset); qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
return 0; return 0;
} }
} }
@ -524,7 +530,8 @@ static void icp_control_write(void *opaque, hwaddr offset,
/* Nothing interesting implemented yet. */ /* Nothing interesting implemented yet. */
break; break;
default: default:
hw_error("icp_control_write: Bad offset %x\n", (int)offset); qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%" HWADDR_PRIX "\n",
__func__, offset);
} }
} }