From patchwork Tue Apr 2 21:45:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 233187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C84DE2C0162 for ; Wed, 3 Apr 2013 09:32:54 +1100 (EST) Received: from localhost ([::1]:36341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN9BU-0005ZN-Og for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 17:56:04 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN96L-0006sZ-A2 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:50:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN96K-0008Rv-1P for qemu-devel@nongnu.org; Tue, 02 Apr 2013 17:50:44 -0400 Received: from mail-yh0-x234.google.com ([2607:f8b0:4002:c01::234]:36042) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN96J-0008Rr-Or; Tue, 02 Apr 2013 17:50:43 -0400 Received: by mail-yh0-f52.google.com with SMTP id q46so137738yhf.25 for ; Tue, 02 Apr 2013 14:50:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=4mVB9T7GO84RuATdty01K4pQQHM1rBZkCmlzqRCdDiU=; b=J5nh5Uu+iyDl1Phmq1UqsY4IY3zYNMZJYyjSySIcKIeNYy53ZkbPvKY96a7pcVCQJM KuDlJnFirlmErNuzKJw4zF9A+Zzc/cKqzOuoOOZqtgqL3NqEKbciFOjXm91vaT5Adl/q Wm7Lbov3hvN1sla/Uqbb1NUAIuK9HiFDupoP5KVhlWpqiCJCaZQAZzi/YOoLl96hk6Xh 1cXNwlnzxN4StwIUsoMuTiQBcfZbP2xztejOoJmuH7MqWelNfWM1FBcClFeA/0sg4k3m rBlljXbE2Qtd43sE34ye8tUKPA/YUiTy2Gaq1gXqz0y+5FuHe3g4fS1Cl0pAEEVVY8CK 35rw== X-Received: by 10.236.126.7 with SMTP id a7mr16628132yhi.98.1364939443259; Tue, 02 Apr 2013 14:50:43 -0700 (PDT) Received: from localhost ([32.97.110.51]) by mx.google.com with ESMTPS id u19sm5736050yhh.15.2013.04.02.14.50.41 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 02 Apr 2013 14:50:42 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 16:45:10 -0500 Message-Id: <1364939142-30066-6-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1364939142-30066-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:4002:c01::234 Cc: qemu-stable@nongnu.org Subject: [Qemu-devel] [PATCH 05/37] qemu-char.c: fix waiting for telnet connection message X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Igor Mitsyanko Current colon position in "waiting for telnet connection" message template produces messages like: QEMU waiting for connection on: telnet::127.0.0.16666,server After moving a colon to the right, we will get a correct messages like: QEMU waiting for connection on: telnet:127.0.0.1:6666,server Signed-off-by: Igor Mitsyanko Signed-off-by: Gerd Hoffmann (cherry picked from commit e5545854dd1e2e3507b210ac0c1cbfca69ff0fcb) Signed-off-by: Michael Roth --- qemu-char.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-char.c b/qemu-char.c index e4b0f53..3e152e1 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2482,7 +2482,7 @@ static CharDriverState *qemu_chr_open_socket_fd(int fd, bool do_nodelay, s->do_nodelay = do_nodelay; getnameinfo((struct sockaddr *) &ss, ss_len, host, sizeof(host), serv, sizeof(serv), NI_NUMERICHOST | NI_NUMERICSERV); - snprintf(chr->filename, 256, "%s:%s:%s%s%s%s", + snprintf(chr->filename, 256, "%s:%s%s%s:%s%s", is_telnet ? "telnet" : "tcp", left, host, right, serv, is_listen ? ",server" : "");