SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/display/xlnx_dp: Replace disabled DPRINTF() by error_report()

Browse Source 
DPRINTF() calls are disabled by default, so when unexpected
data is used, the whole process abort without information.

Display a bit of information with error_report() before crashing.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-id: 20200526062252.19852-10-f4bug@amsat.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-05-26 08:22:47 +02:00 committed by Gerd Hoffmann
parent eeb1168032
commit 7bbdf0f892
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hw/display/xlnx_dp.c
View File

@ -1,5 +1,5 @@
/* /*
* xlnx_dp.c * Xilinx Display Port
* *
* Copyright (C) 2015 : GreenSocs Ltd * Copyright (C) 2015 : GreenSocs Ltd
* http://www.greensocs.com/ , email: info@greensocs.com * http://www.greensocs.com/ , email: info@greensocs.com
@ -24,6 +24,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qemu/error-report.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/display/xlnx_dp.h" #include "hw/display/xlnx_dp.h"
@ -465,7 +466,7 @@ static uint8_t xlnx_dp_aux_pop_tx_fifo(XlnxDPState *s)
uint8_t ret; uint8_t ret;
if (fifo8_is_empty(&s->tx_fifo)) { if (fifo8_is_empty(&s->tx_fifo)) {
DPRINTF("tx_fifo underflow..\n"); error_report("%s: TX_FIFO underflow", __func__);
abort(); abort();
} }
ret = fifo8_pop(&s->tx_fifo); ret = fifo8_pop(&s->tx_fifo);
@ -525,6 +526,7 @@ static void xlnx_dp_aux_set_command(XlnxDPState *s, uint32_t value)
qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n"); qemu_log_mask(LOG_UNIMP, "xlnx_dp: Write i2c status not implemented\n");
break; break;
default: default:
error_report("%s: invalid command: %u", __func__, cmd);
abort(); abort();
} }
@ -631,8 +633,8 @@ static void xlnx_dp_change_graphic_fmt(XlnxDPState *s)
s->g_plane.format = PIXMAN_b8g8r8; s->g_plane.format = PIXMAN_b8g8r8;
break; break;
default: default:
DPRINTF("error: unsupported graphic format %u.\n", error_report("%s: unsupported graphic format %u", __func__,
s->avbufm_registers[AV_BUF_FORMAT] & DP_GRAPHIC_MASK); s->avbufm_registers[AV_BUF_FORMAT] & DP_GRAPHIC_MASK);
abort(); abort();
} }
@ -647,8 +649,8 @@ static void xlnx_dp_change_graphic_fmt(XlnxDPState *s)
s->v_plane.format = PIXMAN_x8b8g8r8; s->v_plane.format = PIXMAN_x8b8g8r8;
break; break;
default: default:
DPRINTF("error: unsupported video format %u.\n", error_report("%s: unsupported video format %u", __func__,
s->avbufm_registers[AV_BUF_FORMAT] & DP_NL_VID_FMT_MASK); s->avbufm_registers[AV_BUF_FORMAT] & DP_NL_VID_FMT_MASK);
abort(); abort();
} }