On 01/07/20 09:06, Markus Armbruster wrote: > lichun <lic...@ruijie.com.cn> writes: > >> Signed-off-by: lichun <lic...@ruijie.com.cn> >> --- >> chardev/char-socket.c | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/chardev/char-socket.c b/chardev/char-socket.c >> index afebeec5c3..569d54c144 100644 >> --- a/chardev/char-socket.c >> +++ b/chardev/char-socket.c >> @@ -142,6 +142,8 @@ static void check_report_connect_error(Chardev *chr, >> "Unable to connect character device %s: ", >> chr->label); >> s->connect_err_reported = true; >> + } else { >> + error_free(err); >> } >> qemu_chr_socket_restart_timer(chr); >> } >> @@ -1086,7 +1088,6 @@ static void qemu_chr_socket_connected(QIOTask *task, >> void *opaque) >> if (qio_task_propagate_error(task, &err)) { >> tcp_chr_change_state(s, TCP_CHARDEV_STATE_DISCONNECTED); >> check_report_connect_error(chr, err); >> - error_free(err); >> goto cleanup; >> } > > Reviewed-by: Markus Armbruster <arm...@redhat.com> > > and queued, thanks! >
Can you please add a note to the commit message? Errors are already freed by error_report_err, so we only need to call error_free when that function is not called. and Cc qemu-stable? Or I can queue it too since it's chardev stuff.