Message ID | 1349275025-5093-15-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
On Wed, 3 Oct 2012 16:37:01 +0200 Paolo Bonzini <pbonzini@redhat.com> wrote: > Among others, before: > > $ qemu-system-x86_64 -chardev socket,port=12345,id=char > inet_connect: host and/or port not specified > chardev: opening backend "socket" failed > > After: > > $ x86_64-softmmu/qemu-system-x86_64 -chardev socket,port=12345,id=char > qemu-system-x86_64: -chardev socket,port=12345,id=char: host and/or port not specified > chardev: opening backend "socket" failed > > perror and fprintf can be removed because all clients can now > consume Errors properly. Will trust you there :) > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> I honestly don't like to keep the QERR_ macros around, I think we should kill them when we have the opportunity to do so, but patch looks good so: Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com> > --- > qemu-sockets.c | 30 +++++++++--------------------- > 1 file modificato, 9 inserzioni(+), 21 rimozioni(-) > > diff --git a/qemu-sockets.c b/qemu-sockets.c > index 341ae21..8ab2d0c 100644 > --- a/qemu-sockets.c > +++ b/qemu-sockets.c > @@ -120,8 +120,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) > > if ((qemu_opt_get(opts, "host") == NULL) || > (qemu_opt_get(opts, "port") == NULL)) { > - fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__); > - error_set(errp, QERR_SOCKET_CREATE_FAILED); > + error_setg(errp, "host and/or port not specified"); > return -1; > } > pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); > @@ -138,9 +137,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) > snprintf(port, sizeof(port), "%d", atoi(port) + port_offset); > rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res); > if (rc != 0) { > - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, > - gai_strerror(rc)); > - error_set(errp, QERR_SOCKET_CREATE_FAILED); > + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, > + gai_strerror(rc)); > return -1; > } > > @@ -151,10 +149,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) > NI_NUMERICHOST | NI_NUMERICSERV); > slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); > if (slisten < 0) { > - fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, > - inet_strfamily(e->ai_family), strerror(errno)); > if (!e->ai_next) { > - error_set(errp, QERR_SOCKET_CREATE_FAILED); > + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); > } > continue; > } > @@ -176,24 +172,19 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) > goto listen; > } > if (p == port_max) { > - fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, > - inet_strfamily(e->ai_family), uaddr, inet_getport(e), > - strerror(errno)); > if (!e->ai_next) { > - error_set(errp, QERR_SOCKET_BIND_FAILED); > + error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED); > } > } > } > closesocket(slisten); > } > - fprintf(stderr, "%s: FAILED\n", __FUNCTION__); > freeaddrinfo(res); > return -1; > > listen: > if (listen(slisten,1) != 0) { > - error_set(errp, QERR_SOCKET_LISTEN_FAILED); > - perror("listen"); > + error_set_errno(errp, errno, QERR_SOCKET_LISTEN_FAILED); > closesocket(slisten); > freeaddrinfo(res); > return -1; > @@ -325,9 +316,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) > addr = qemu_opt_get(opts, "host"); > port = qemu_opt_get(opts, "port"); > if (addr == NULL || port == NULL) { > - fprintf(stderr, > - "inet_parse_connect_opts: host and/or port not specified\n"); > - error_set(errp, QERR_SOCKET_CREATE_FAILED); > + error_setg(errp, "host and/or port not specified"); > return NULL; > } > > @@ -341,9 +330,8 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) > /* lookup */ > rc = getaddrinfo(addr, port, &ai, &res); > if (rc != 0) { > - fprintf(stderr, "getaddrinfo(%s,%s): %s\n", addr, port, > - gai_strerror(rc)); > - error_set(errp, QERR_SOCKET_CREATE_FAILED); > + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, > + gai_strerror(rc)); > return NULL; > } > return res;
diff --git a/qemu-sockets.c b/qemu-sockets.c index 341ae21..8ab2d0c 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -120,8 +120,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) if ((qemu_opt_get(opts, "host") == NULL) || (qemu_opt_get(opts, "port") == NULL)) { - fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "host and/or port not specified"); return -1; } pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); @@ -138,9 +137,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) snprintf(port, sizeof(port), "%d", atoi(port) + port_offset); rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res); if (rc != 0) { - fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); return -1; } @@ -151,10 +149,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) NI_NUMERICHOST | NI_NUMERICSERV); slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); if (slisten < 0) { - fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__, - inet_strfamily(e->ai_family), strerror(errno)); if (!e->ai_next) { - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED); } continue; } @@ -176,24 +172,19 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp) goto listen; } if (p == port_max) { - fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, - inet_strfamily(e->ai_family), uaddr, inet_getport(e), - strerror(errno)); if (!e->ai_next) { - error_set(errp, QERR_SOCKET_BIND_FAILED); + error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED); } } } closesocket(slisten); } - fprintf(stderr, "%s: FAILED\n", __FUNCTION__); freeaddrinfo(res); return -1; listen: if (listen(slisten,1) != 0) { - error_set(errp, QERR_SOCKET_LISTEN_FAILED); - perror("listen"); + error_set_errno(errp, errno, QERR_SOCKET_LISTEN_FAILED); closesocket(slisten); freeaddrinfo(res); return -1; @@ -325,9 +316,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) addr = qemu_opt_get(opts, "host"); port = qemu_opt_get(opts, "port"); if (addr == NULL || port == NULL) { - fprintf(stderr, - "inet_parse_connect_opts: host and/or port not specified\n"); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "host and/or port not specified"); return NULL; } @@ -341,9 +330,8 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp) /* lookup */ rc = getaddrinfo(addr, port, &ai, &res); if (rc != 0) { - fprintf(stderr, "getaddrinfo(%s,%s): %s\n", addr, port, - gai_strerror(rc)); - error_set(errp, QERR_SOCKET_CREATE_FAILED); + error_setg(errp, "address resolution failed for %s:%s: %s", addr, port, + gai_strerror(rc)); return NULL; } return res;
Among others, before: $ qemu-system-x86_64 -chardev socket,port=12345,id=char inet_connect: host and/or port not specified chardev: opening backend "socket" failed After: $ x86_64-softmmu/qemu-system-x86_64 -chardev socket,port=12345,id=char qemu-system-x86_64: -chardev socket,port=12345,id=char: host and/or port not specified chardev: opening backend "socket" failed perror and fprintf can be removed because all clients can now consume Errors properly. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- qemu-sockets.c | 30 +++++++++--------------------- 1 file modificato, 9 inserzioni(+), 21 rimozioni(-)