| Message ID | 20220808080116.2184881-1-cyruscyliu@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xlnx_dp: drop unsupported AUXCommand in xlnx_dp_aux_set_command | expand |
On 08/08/2022 10.01, Qiang Liu wrote: > 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; Reviewed-by: Thomas Huth <thuth@redhat.com>
Le 08/08/2022 à 10:01, Qiang Liu a écrit : > 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; Applied to my trivial-patches branch. Thanks, Laurent
On Mon, Aug 8, 2022 at 6:09 PM Qiang Liu <cyruscyliu@gmail.com> wrote: > > 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> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > 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 > >
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(-)