| Message ID | 20220808075507.2183603-1-cyruscyliu@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command | expand |
> -----Original Message----- > From: Qemu-devel <qemu-devel- > bounces+fkonrad=amd.com@nongnu.org> On Behalf Of Qiang Liu > Sent: 08 August 2022 08:55 > To: qemu-devel@nongnu.org > Cc: Qiang Liu <cyruscyliu@gmail.com>; Thomas Huth <thuth@redhat.com>; > Alistair Francis <alistair@alistair23.me>; Edgar E. Iglesias > <edgar.iglesias@gmail.com>; Peter Maydell <peter.maydell@linaro.org>; > open list:Xilinx ZynqMP and... <qemu-arm@nongnu.org> > Subject: [PATCH] xlnx_dp: drop unsupported AUXCommand in > xlnx_dp_aux_set_command > > In xlnx_dp_aux_set_command, when the command leads to the default > branch, xlxn-dp will abort and then crash. > > This patch removes this abort and drops this operation. > > Fixes: 58ac482 ("introduce xlnx-dp") > Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411 > Reported-by: Qiang Liu <cyruscyliu@gmail.com> > Tested-by: Qiang Liu <cyruscyliu@gmail.com> > Suggested-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Qiang Liu <cyruscyliu@gmail.com> > --- > hw/display/xlnx_dp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c > index a071c81..b0828d6 100644 > --- a/hw/display/xlnx_dp.c > +++ b/hw/display/xlnx_dp.c > @@ -532,8 +532,8 @@ 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"); > break; > default: > - error_report("%s: invalid command: %u", __func__, cmd); > - abort(); > + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", > __func__, cmd); > + return; > } > > s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04; > -- > 2.25.1 > Looks good to me. Reviewed-by: Frederic Konrad <fkonrad@amd.com>
diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c index a071c81..b0828d6 100644 --- a/hw/display/xlnx_dp.c +++ b/hw/display/xlnx_dp.c @@ -532,8 +532,8 @@ 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"); break; default: - error_report("%s: invalid command: %u", __func__, cmd); - abort(); + qemu_log_mask(LOG_GUEST_ERROR, "%s: invalid command: %u", __func__, cmd); + return; } s->core_registers[DP_INTERRUPT_SIGNAL_STATE] |= 0x04;
In xlnx_dp_aux_set_command, when the command leads to the default branch, xlxn-dp will abort and then crash. This patch removes this abort and drops this operation. Fixes: 58ac482 ("introduce xlnx-dp") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/411 Reported-by: Qiang Liu <cyruscyliu@gmail.com> Tested-by: Qiang Liu <cyruscyliu@gmail.com> Suggested-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Qiang Liu <cyruscyliu@gmail.com> --- hw/display/xlnx_dp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)