From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51927) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsRtj-0004lJ-LP for qemu-devel@nongnu.org; Sat, 31 Oct 2015 04:52:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZsRtg-0006Ty-Gj for qemu-devel@nongnu.org; Sat, 31 Oct 2015 04:52:27 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:41649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZsRtf-0006Sp-4W for qemu-devel@nongnu.org; Sat, 31 Oct 2015 04:52:24 -0400 Message-ID: <56348125.8050607@huawei.com> Date: Sat, 31 Oct 2015 16:51:49 +0800 From: Shannon Zhao MIME-Version: 1.0 References: <1444648509-29179-1-git-send-email-berrange@redhat.com> <1444648509-29179-4-git-send-email-berrange@redhat.com> <1445449978.7681.367.camel@ifi.uio.no> In-Reply-To: <1445449978.7681.367.camel@ifi.uio.no> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2 03/16] sockets: allow port to be NULL when listening on IP address List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Knut Omang , "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Paolo Bonzini , "Dr. David Alan Gilbert" On 2015/10/22 1:52, Knut Omang wrote: > On Mon, 2015-10-12 at 12:14 +0100, Daniel P. Berrange wrote: >> If the port in the SocketAddress struct is NULL, it can allow >> the kernel to automatically select a free port. This is useful >> in particular in unit tests to avoid a race trying to find a >> free port to run a test case on. > > This patch seems to do a bit more than it claims ;-) > > I just noticed that after a rebase a few minutes ago, all options I > have that uses this type of port syntax: > > -serial telnet:ip:port > -serial tcp:ip:port > -qmp ip:port > And -monitor telnet::4444,server,nowait makes QEMU exit. So do we decide how to fix this? > started to ignore the port argument and instead provide a dynamic port. > Rebasing without this patch fixes the issue, > > Thanks, > Knut > >> >> Signed-off-by: Daniel P. Berrange >> --- >> util/qemu-sockets.c | 18 +++++++++++++----- >> 1 file changed, 13 insertions(+), 5 deletions(-) >> >> diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c >> index 9cc5bee..f9d2f6e 100644 >> --- a/util/qemu-sockets.c >> +++ b/util/qemu-sockets.c >> @@ -128,12 +128,15 @@ int inet_listen_opts(QemuOpts *opts, int >> port_offset, Error **errp) >> ai.ai_family = PF_UNSPEC; >> ai.ai_socktype = SOCK_STREAM; >> >> - if ((qemu_opt_get(opts, "host") == NULL) || >> - (qemu_opt_get(opts, "port") == NULL)) { >> - error_setg(errp, "host and/or port not specified"); >> + if ((qemu_opt_get(opts, "host") == NULL)) { >> + error_setg(errp, "host not specified"); >> return -1; >> } >> - pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); >> + if (qemu_opt_get(opts, "port") != NULL) { >> + pstrcpy(port, sizeof(port), qemu_opt_get(opts, "port")); >> + } else { >> + port[0] = '\0'; >> + } >> addr = qemu_opt_get(opts, "host"); >> >> to = qemu_opt_get_number(opts, "to", 0); >> @@ -145,6 +148,10 @@ int inet_listen_opts(QemuOpts *opts, int >> port_offset, Error **errp) >> /* lookup */ >> if (port_offset) { >> unsigned long long baseport; >> + if (strlen(port) == 0) { >> + error_setg(errp, "port not specified"); >> + return -1; >> + } >> if (parse_uint_full(port, &baseport, 10) < 0) { >> error_setg(errp, "can't convert to a number: %s", port); >> return -1; >> @@ -156,7 +163,8 @@ int inet_listen_opts(QemuOpts *opts, int >> port_offset, Error **errp) >> } >> snprintf(port, sizeof(port), "%d", (int)baseport + >> port_offset); >> } >> - rc = getaddrinfo(strlen(addr) ? addr : NULL, port, &ai, &res); >> + rc = getaddrinfo(strlen(addr) ? addr : NULL, >> + strlen(port) ? port : NULL, &ai, &res); >> if (rc != 0) { >> error_setg(errp, "address resolution failed for %s:%s: %s", >> addr, port, >> gai_strerror(rc)); > > > -- Shannon