vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qemu-sockets: include strerror or gai_strerror output in error messages 

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.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Paolo Bonzini 2012-10-02 09:18:02 +02:00
parent 2d55f0e817
commit a12fb8ad5b
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
qemu-sockets.c
View File

@ -120,8 +120,7 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp)
if ((qemu_opt_get(opts, "host") == NULL) || if ((qemu_opt_get(opts, "host") == NULL) ||
(qemu_opt_get(opts, "port") == NULL)) { (qemu_opt_get(opts, "port") == NULL)) {
fprintf(stderr, "%s: host and/or port not specified\n", __FUNCTION__); error_setg(errp, "host and/or port not specified");
error_set(errp, QERR_SOCKET_CREATE_FAILED);
return -1; return -1;
} }
pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); 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); snprintf(port, sizeof(port), "%d", atoi(port) + port_offset);
rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res); rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res);
if (rc != 0) { if (rc != 0) {
fprintf(stderr,"getaddrinfo(%s,%s): %s\n", addr, port, error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
gai_strerror(rc)); gai_strerror(rc));
error_set(errp, QERR_SOCKET_CREATE_FAILED);
return -1; return -1;
} }
@ -151,10 +149,8 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp)
NI_NUMERICHOST | NI_NUMERICSERV); NI_NUMERICHOST | NI_NUMERICSERV);
slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol); slisten = qemu_socket(e->ai_family, e->ai_socktype, e->ai_protocol);
if (slisten < 0) { if (slisten < 0) {
fprintf(stderr,"%s: socket(%s): %s\n", __FUNCTION__,
inet_strfamily(e->ai_family), strerror(errno));
if (!e->ai_next) { if (!e->ai_next) {
error_set(errp, QERR_SOCKET_CREATE_FAILED); error_set_errno(errp, errno, QERR_SOCKET_CREATE_FAILED);
} }
continue; continue;
} }
@ -176,24 +172,19 @@ int inet_listen_opts(QemuOpts *opts, int port_offset, Error **errp)
goto listen; goto listen;
} }
if (p == port_max) { 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) { if (!e->ai_next) {
error_set(errp, QERR_SOCKET_BIND_FAILED); error_set_errno(errp, errno, QERR_SOCKET_BIND_FAILED);
} }
} }
} }
closesocket(slisten); closesocket(slisten);
} }
fprintf(stderr, "%s: FAILED\n", __FUNCTION__);
freeaddrinfo(res); freeaddrinfo(res);
return -1; return -1;
listen: listen:
if (listen(slisten,1) != 0) { if (listen(slisten,1) != 0) {
error_set(errp, QERR_SOCKET_LISTEN_FAILED); error_set_errno(errp, errno, QERR_SOCKET_LISTEN_FAILED);
perror("listen");
closesocket(slisten); closesocket(slisten);
freeaddrinfo(res); freeaddrinfo(res);
return -1; return -1;
@ -324,9 +315,7 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp)
addr = qemu_opt_get(opts, "host"); addr = qemu_opt_get(opts, "host");
port = qemu_opt_get(opts, "port"); port = qemu_opt_get(opts, "port");
if (addr == NULL || port == NULL) { if (addr == NULL || port == NULL) {
fprintf(stderr, error_setg(errp, "host and/or port not specified");
"inet_parse_connect_opts: host and/or port not specified\n");
error_set(errp, QERR_SOCKET_CREATE_FAILED);
return NULL; return NULL;
} }
@ -340,9 +329,8 @@ static struct addrinfo *inet_parse_connect_opts(QemuOpts *opts, Error **errp)
/* lookup */ /* lookup */
rc = getaddrinfo(addr, port, &ai, &res); rc = getaddrinfo(addr, port, &ai, &res);
if (rc != 0) { if (rc != 0) {
fprintf(stderr, "getaddrinfo(%s,%s): %s\n", addr, port, error_setg(errp, "address resolution failed for %s:%s: %s", addr, port,
gai_strerror(rc)); gai_strerror(rc));
error_set(errp, QERR_SOCKET_CREATE_FAILED);
return NULL; return NULL;
} }
return res; return res;