[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 06/12] chardev: remove unused 'sioc' variable &
From: |
Marc-André Lureau |
Subject: |
Re: [Qemu-devel] [PATCH 06/12] chardev: remove unused 'sioc' variable & cleanup paths |
Date: |
Tue, 15 Jan 2019 23:39:45 +0400 |
On Tue, Jan 15, 2019 at 6:53 PM Daniel P. Berrangé <address@hidden> wrote:
>
> The 'sioc' variable in qmp_chardev_open_socket was unused since
>
> commit 3e7d4d20d3a528b1ed10b1dc3d83119bfb0c5f24
> Author: Peter Xu <address@hidden>
> Date: Tue Mar 6 13:33:17 2018 +0800
>
> chardev: use chardev's gcontext for async connect
>
> Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
> ---
> chardev/char-socket.c | 22 +++++++---------------
> 1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/chardev/char-socket.c b/chardev/char-socket.c
> index ba86284ea9..3b6ff6619b 100644
> --- a/chardev/char-socket.c
> +++ b/chardev/char-socket.c
> @@ -1073,7 +1073,6 @@ static void qmp_chardev_open_socket(Chardev *chr,
> bool is_waitconnect = sock->has_wait ? sock->wait : false;
> bool is_websock = sock->has_websocket ? sock->websocket : false;
> int64_t reconnect = sock->has_reconnect ? sock->reconnect : 0;
> - QIOChannelSocket *sioc = NULL;
> SocketAddress *addr;
>
> s->is_listen = is_listen;
> @@ -1088,7 +1087,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
> if (!creds) {
> error_setg(errp, "No TLS credentials with id '%s'",
> sock->tls_creds);
> - goto error;
> + return;
> }
> s->tls_creds = (QCryptoTLSCreds *)
> object_dynamic_cast(creds,
> @@ -1096,20 +1095,20 @@ static void qmp_chardev_open_socket(Chardev *chr,
> if (!s->tls_creds) {
> error_setg(errp, "Object with id '%s' is not TLS credentials",
> sock->tls_creds);
> - goto error;
> + return;
> }
> object_ref(OBJECT(s->tls_creds));
> if (is_listen) {
> if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_SERVER)
> {
> error_setg(errp, "%s",
> "Expected TLS credentials for server endpoint");
> - goto error;
> + return;
> }
> } else {
> if (s->tls_creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT)
> {
> error_setg(errp, "%s",
> "Expected TLS credentials for client endpoint");
> - goto error;
> + return;
> }
> }
> }
> @@ -1117,7 +1116,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
> s->addr = addr = socket_address_flatten(sock->addr);
>
> if (!qmp_chardev_validate_socket(sock, addr, errp)) {
> - goto error;
> + return;
> }
>
> qemu_chr_set_feature(chr, QEMU_CHAR_FEATURE_RECONNECTABLE);
> @@ -1153,7 +1152,7 @@ static void qmp_chardev_open_socket(Chardev *chr,
> if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0) {
> object_unref(OBJECT(s->listener));
> s->listener = NULL;
> - goto error;
> + return;
> }
>
> qapi_free_SocketAddress(s->addr);
> @@ -1171,16 +1170,9 @@ static void qmp_chardev_open_socket(Chardev *chr,
> chr->gcontext);
> }
> } else if (qemu_chr_wait_connected(chr, errp) < 0) {
> - goto error;
> + return;
> }
> }
> -
> - return;
> -
> -error:
> - if (sioc) {
> - object_unref(OBJECT(sioc));
> - }
> }
>
> static void qemu_chr_parse_socket(QemuOpts *opts, ChardevBackend *backend,
> --
> 2.20.1
>