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

qemu-sockets: add Error ** to all functions 

This lets me adjust the clients to do proper error propagation first,
thus avoiding temporary regressions in the quality of the error messages.

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
master
Paolo Bonzini 2012-10-02 09:35:32 +02:00
parent 680d16dcb7
commit 7fc4e63ec0
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nbd.c
View File

@ -230,12 +230,12 @@ int unix_socket_incoming(const char *path)
char *ostr = NULL; char *ostr = NULL;
int olen = 0; int olen = 0;
return unix_listen(path, ostr, olen); return unix_listen(path, ostr, olen, NULL);
} }
int unix_socket_outgoing(const char *path) int unix_socket_outgoing(const char *path)
{ {
return unix_connect(path); return unix_connect(path, NULL);
} }
/* Basic flow for negotiation /* Basic flow for negotiation

6
qemu-char.c
View File

@ -2102,7 +2102,7 @@ static CharDriverState *qemu_chr_open_udp(QemuOpts *opts)
chr = g_malloc0(sizeof(CharDriverState)); chr = g_malloc0(sizeof(CharDriverState));
s = g_malloc0(sizeof(NetCharDriver)); s = g_malloc0(sizeof(NetCharDriver));
fd = inet_dgram_opts(opts); fd = inet_dgram_opts(opts, NULL);
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "inet_dgram_opts failed\n"); fprintf(stderr, "inet_dgram_opts failed\n");
goto return_err; goto return_err;
@ -2448,9 +2448,9 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts)
if (is_unix) { if (is_unix) {
if (is_listen) { if (is_listen) {
fd = unix_listen_opts(opts); fd = unix_listen_opts(opts, NULL);
} else { } else {
fd = unix_connect_opts(opts); fd = unix_connect_opts(opts, NULL);
} }
} else { } else {
if (is_listen) { if (is_listen) {

22
qemu-sockets.c
View File

@ -403,7 +403,7 @@ int inet_connect_opts(QemuOpts *opts, Error **errp,
return sock; return sock;
} }
int inet_dgram_opts(QemuOpts *opts) int inet_dgram_opts(QemuOpts *opts, Error **errp)
{ {
struct addrinfo ai, *peer = NULL, *local = NULL; struct addrinfo ai, *peer = NULL, *local = NULL;
const char *addr; const char *addr;
@ -653,7 +653,7 @@ int inet_nonblocking_connect(const char *str,
#ifndef _WIN32 #ifndef _WIN32
int unix_listen_opts(QemuOpts *opts) int unix_listen_opts(QemuOpts *opts, Error **errp)
{ {
struct sockaddr_un un; struct sockaddr_un un;
const char *path = qemu_opt_get(opts, "path"); const char *path = qemu_opt_get(opts, "path");
@ -701,7 +701,7 @@ err:
return -1; return -1;
} }
int unix_connect_opts(QemuOpts *opts) int unix_connect_opts(QemuOpts *opts, Error **errp)
{ {
struct sockaddr_un un; struct sockaddr_un un;
const char *path = qemu_opt_get(opts, "path"); const char *path = qemu_opt_get(opts, "path");
@ -731,7 +731,7 @@ int unix_connect_opts(QemuOpts *opts)
} }
/* compatibility wrapper */ /* compatibility wrapper */
int unix_listen(const char *str, char *ostr, int olen) int unix_listen(const char *str, char *ostr, int olen, Error **errp)
{ {
QemuOpts *opts; QemuOpts *opts;
char *path, *optstr; char *path, *optstr;
@ -752,7 +752,7 @@ int unix_listen(const char *str, char *ostr, int olen)
qemu_opt_set(opts, "path", str); qemu_opt_set(opts, "path", str);
} }
sock = unix_listen_opts(opts); sock = unix_listen_opts(opts, errp);
if (sock != -1 && ostr) if (sock != -1 && ostr)
snprintf(ostr, olen, "%s%s", qemu_opt_get(opts, "path"), optstr ? optstr : ""); snprintf(ostr, olen, "%s%s", qemu_opt_get(opts, "path"), optstr ? optstr : "");
@ -760,42 +760,42 @@ int unix_listen(const char *str, char *ostr, int olen)
return sock; return sock;
} }
int unix_connect(const char *path) int unix_connect(const char *path, Error **errp)
{ {
QemuOpts *opts; QemuOpts *opts;
int sock; int sock;
opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL); opts = qemu_opts_create(&dummy_opts, NULL, 0, NULL);
qemu_opt_set(opts, "path", path); qemu_opt_set(opts, "path", path);
sock = unix_connect_opts(opts); sock = unix_connect_opts(opts, errp);
qemu_opts_del(opts); qemu_opts_del(opts);
return sock; return sock;
} }
#else #else
int unix_listen_opts(QemuOpts *opts) int unix_listen_opts(QemuOpts *opts, Error **errp)
{ {
fprintf(stderr, "unix sockets are not available on windows\n"); fprintf(stderr, "unix sockets are not available on windows\n");
errno = ENOTSUP; errno = ENOTSUP;
return -1; return -1;
} }
int unix_connect_opts(QemuOpts *opts) int unix_connect_opts(QemuOpts *opts, Error **errp)
{ {
fprintf(stderr, "unix sockets are not available on windows\n"); fprintf(stderr, "unix sockets are not available on windows\n");
errno = ENOTSUP; errno = ENOTSUP;
return -1; return -1;
} }
int unix_listen(const char *path, char *ostr, int olen) int unix_listen(const char *path, char *ostr, int olen, Error **errp)
{ {
fprintf(stderr, "unix sockets are not available on windows\n"); fprintf(stderr, "unix sockets are not available on windows\n");
errno = ENOTSUP; errno = ENOTSUP;
return -1; return -1;
} }
int unix_connect(const char *path) int unix_connect(const char *path, Error **errp)
{ {
fprintf(stderr, "unix sockets are not available on windows\n"); fprintf(stderr, "unix sockets are not available on windows\n");
errno = ENOTSUP; errno = ENOTSUP;

10
qemu_socket.h
View File

@ -53,13 +53,13 @@ int inet_nonblocking_connect(const char *str,
NonBlockingConnectHandler *callback, NonBlockingConnectHandler *callback,
void *opaque, Error **errp); void *opaque, Error **errp);
int inet_dgram_opts(QemuOpts *opts); int inet_dgram_opts(QemuOpts *opts, Error **errp);
const char *inet_strfamily(int family); const char *inet_strfamily(int family);
int unix_listen_opts(QemuOpts *opts); int unix_listen_opts(QemuOpts *opts, Error **errp);
int unix_listen(const char *path, char *ostr, int olen); int unix_listen(const char *path, char *ostr, int olen, Error **errp);
int unix_connect_opts(QemuOpts *opts); int unix_connect_opts(QemuOpts *opts, Error **errp);
int unix_connect(const char *path); int unix_connect(const char *path, Error **errp);
/* Old, ipv4 only bits. Don't use for new code. */ /* Old, ipv4 only bits. Don't use for new code. */
int parse_host_port(struct sockaddr_in *saddr, const char *str); int parse_host_port(struct sockaddr_in *saddr, const char *str);

2
qga/channel-posix.c
View File

@ -181,7 +181,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod
break; break;
} }
case GA_CHANNEL_UNIX_LISTEN: { case GA_CHANNEL_UNIX_LISTEN: {
int fd = unix_listen(path, NULL, strlen(path)); int fd = unix_listen(path, NULL, strlen(path), NULL);
if (fd == -1) { if (fd == -1) {
g_critical("error opening path: %s", strerror(errno)); g_critical("error opening path: %s", strerror(errno));
return false; return false;

4
ui/vnc.c
View File

@ -3065,7 +3065,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
if (reverse) { if (reverse) {
/* connect to viewer */ /* connect to viewer */
if (strncmp(display, "unix:", 5) == 0) if (strncmp(display, "unix:", 5) == 0)
vs->lsock = unix_connect(display+5); vs->lsock = unix_connect(display+5, NULL);
else else
vs->lsock = inet_connect(display, NULL); vs->lsock = inet_connect(display, NULL);
if (-1 == vs->lsock) { if (-1 == vs->lsock) {
@ -3085,7 +3085,7 @@ int vnc_display_open(DisplayState *ds, const char *display)
dpy = g_malloc(256); dpy = g_malloc(256);
if (strncmp(display, "unix:", 5) == 0) { if (strncmp(display, "unix:", 5) == 0) {
pstrcpy(dpy, 256, "unix:"); pstrcpy(dpy, 256, "unix:");
vs->lsock = unix_listen(display+5, dpy+5, 256-5); vs->lsock = unix_listen(display+5, dpy+5, 256-5, NULL);
} else { } else {
vs->lsock = inet_listen(display, dpy, 256, vs->lsock = inet_listen(display, dpy, 256,
SOCK_STREAM, 5900, NULL); SOCK_STREAM, 5900, NULL);