From e6c4431725adfe2794c08e7e94a26b3e1f1ade9b Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: <94968b7fa9b14e71f004474d7ce77e189e6a2bf3.1349175436.git.minovotn@redhat.com> References: <94968b7fa9b14e71f004474d7ce77e189e6a2bf3.1349175436.git.minovotn@redhat.com> From: Amos Kong Date: Mon, 1 Oct 2012 14:12:34 +0200 Subject: [PATCH 21/34] sockets: Drop sockets_debug debug code RH-Author: Amos Kong Message-id: <1349100767-9066-2-git-send-email-akong@redhat.com> Patchwork-id: 42560 O-Subject: [RHEL-6.4 qemu-kvm PATCH v7 01/14] sockets: Drop sockets_debug debug code Bugzilla: 680356 RH-Acked-by: Paolo Bonzini RH-Acked-by: Markus Armbruster RH-Acked-by: Orit Wasserman From: Markus Armbruster I'm trying to improve this code's error reporting, and the debug code is getting in my way: it clutters the code, it clobbers errno in inconvenient places, and it uses the same fprintf() both for error reporting and debug output in a few places. Get rid of it. Once decent error reporting is in place, adding back whatever debug code we need shouldn't be hard. (Cherry-picked from commit 136faa362d2835998a04779696a504147cf410ce) Signed-off-by: Markus Armbruster Signed-off-by: Anthony Liguori --- qemu-sockets.c | 43 ++----------------------------------------- 1 files changed, 2 insertions(+), 41 deletions(-) Signed-off-by: Michal Novotny --- qemu-sockets.c | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/qemu-sockets.c b/qemu-sockets.c index b0e4aad..12c97fb 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -26,7 +26,6 @@ # define AI_ADDRCONFIG 0 #endif -static int sockets_debug = 0; static const int on=1, off=0; /* used temporarely until all users are converted to QemuOpts */ @@ -101,21 +100,6 @@ const char *inet_strfamily(int family) return "unknown"; } -static void inet_print_addrinfo(const char *tag, struct addrinfo *res) -{ - struct addrinfo *e; - char uaddr[INET6_ADDRSTRLEN+1]; - char uport[33]; - - for (e = res; e != NULL; e = e->ai_next) { - getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, - uaddr,INET6_ADDRSTRLEN,uport,32, - NI_NUMERICHOST | NI_NUMERICSERV); - fprintf(stderr,"%s: getaddrinfo: family %s, host %s, port %s\n", - tag, inet_strfamily(e->ai_family), uaddr, uport); - } -} - int inet_listen_opts(QemuOpts *opts, int port_offset) { struct addrinfo ai,*res,*e; @@ -153,8 +137,6 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) gai_strerror(rc)); return -1; } - if (sockets_debug) - inet_print_addrinfo(__FUNCTION__, res); /* create socket + bind */ for (e = res; e != NULL; e = e->ai_next) { @@ -179,13 +161,10 @@ int inet_listen_opts(QemuOpts *opts, int port_offset) for (;;) { if (bind(slisten, e->ai_addr, e->ai_addrlen) == 0) { - if (sockets_debug) - fprintf(stderr,"%s: bind(%s,%s,%d): OK\n", __FUNCTION__, - inet_strfamily(e->ai_family), uaddr, inet_getport(e)); goto listen; } try_next = to && (inet_getport(e) <= to + port_offset); - if (!try_next || sockets_debug) + if (!try_next) fprintf(stderr,"%s: bind(%s,%s,%d): %s\n", __FUNCTION__, inet_strfamily(e->ai_family), uaddr, inet_getport(e), strerror(errno)); @@ -249,8 +228,6 @@ int inet_connect_opts(QemuOpts *opts) gai_strerror(rc)); return -1; } - if (sockets_debug) - inet_print_addrinfo(__FUNCTION__, res); for (e = res; e != NULL; e = e->ai_next) { if (getnameinfo((struct sockaddr*)e->ai_addr,e->ai_addrlen, @@ -269,17 +246,13 @@ int inet_connect_opts(QemuOpts *opts) /* connect to peer */ if (connect(sock,e->ai_addr,e->ai_addrlen) < 0) { - if (sockets_debug || NULL == e->ai_next) + if (NULL == e->ai_next) fprintf(stderr, "%s: connect(%s,%s,%s,%s): %s\n", __FUNCTION__, inet_strfamily(e->ai_family), e->ai_canonname, uaddr, uport, strerror(errno)); closesocket(sock); continue; } - if (sockets_debug) - fprintf(stderr, "%s: connect(%s,%s,%s,%s): OK\n", __FUNCTION__, - inet_strfamily(e->ai_family), - e->ai_canonname, uaddr, uport); freeaddrinfo(res); return sock; } @@ -322,10 +295,6 @@ int inet_dgram_opts(QemuOpts *opts) gai_strerror(rc)); return -1; } - if (sockets_debug) { - fprintf(stderr, "%s: peer (%s:%s)\n", __FUNCTION__, addr, port); - inet_print_addrinfo(__FUNCTION__, peer); - } /* lookup local addr */ memset(&ai,0, sizeof(ai)); @@ -346,10 +315,6 @@ int inet_dgram_opts(QemuOpts *opts) gai_strerror(rc)); return -1; } - if (sockets_debug) { - fprintf(stderr, "%s: local (%s:%s)\n", __FUNCTION__, addr, port); - inet_print_addrinfo(__FUNCTION__, local); - } /* create socket */ sock = qemu_socket(peer->ai_family, peer->ai_socktype, peer->ai_protocol); @@ -541,8 +506,6 @@ int unix_listen_opts(QemuOpts *opts) goto err; } - if (sockets_debug) - fprintf(stderr, "bind(unix:%s): OK\n", un.sun_path); return sock; err: @@ -576,8 +539,6 @@ int unix_connect_opts(QemuOpts *opts) return -1; } - if (sockets_debug) - fprintf(stderr, "connect(unix:%s): OK\n", path); return sock; } -- 1.7.11.4