From patchwork Fri Oct 19 13:31:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 192721 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 0A3202C008E for ; Sat, 20 Oct 2012 01:24:43 +1100 (EST) Received: from localhost ([::1]:38555 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCi3-0006aP-5v for incoming@patchwork.ozlabs.org; Fri, 19 Oct 2012 09:33:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChp-0006PE-Uh for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPChl-0006ai-IQ for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:41 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:59837) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPChl-0005yp-BG for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:33:37 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so369528pad.4 for ; Fri, 19 Oct 2012 06:33:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:subject:date:message-id:x-mailer:in-reply-to :references; bh=vA3agfPGKSiNezxHCxHfhLsVoQqrXfstjeysxFnKiY4=; b=pdSfgFYWR6lt0uMA8J5wKX9Gvg6uO7oHe5/5fGpcZu2ef0EJdJgTn+R7lJ1H8AnlvJ V7mgCCP9qhGfR7fY3WH0+0WsT3Nozszl2FvXtavWsWKm4hyzbrdvnOQyNuOhxzP2Rmeg 2nU8cjAz8U0MNWc+iyJ3mzMXaKN1q3V0ESwaERzOQ8mfXjUsmVRA2sYmHDlCPHnrjvAi asCWLMkDQQ2ba1m3EX1KMblCuvH721hyMipxcrewWgSZo0AWdqMkpGm4+Xf4NiTQY92I Vnz6qus5+t0coGkw8r8kdnOoH75er/Gi/AVnOv89CcWYNfYE1aJqRkPkOe8e/5ED4BtH IKvw== Received: by 10.66.79.168 with SMTP id k8mr3592501pax.12.1350653617003; Fri, 19 Oct 2012 06:33:37 -0700 (PDT) Received: from yakj.usersys.redhat.com (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id kr4sm1240726pbc.76.2012.10.19.06.33.30 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Oct 2012 06:33:34 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 19 Oct 2012 15:31:54 +0200 Message-Id: <1350653528-5834-16-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.220.45 Subject: [Qemu-devel] [PATCH 15/29] vnc: reorganize code for reverse mode 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 Avoid the dance between csock and vs->lsock. Signed-off-by: Paolo Bonzini --- console.h | 2 +- qmp.c | 6 ++---- ui/vnc.c | 20 +++++++++----------- 3 file modificati, 12 inserzioni(+), 16 rimozioni(-) diff --git a/console.h b/console.h index f990684..6099d8d 100644 --- a/console.h +++ b/console.h @@ -378,7 +378,7 @@ void cocoa_display_init(DisplayState *ds, int full_screen); /* vnc.c */ void vnc_display_init(DisplayState *ds); void vnc_display_close(DisplayState *ds); -int vnc_display_open(DisplayState *ds, const char *display); +void vnc_display_open(DisplayState *ds, const char *display, Error **errp); void vnc_display_add_client(DisplayState *ds, int csock, int skipauth); int vnc_display_disable_login(DisplayState *ds); char *vnc_display_local_addr(DisplayState *ds); diff --git a/qmp.c b/qmp.c index 36c54c5..31bc3bf 100644 --- a/qmp.c +++ b/qmp.c @@ -349,11 +349,9 @@ void qmp_change_vnc_password(const char *password, Error **errp) } } -static void qmp_change_vnc_listen(const char *target, Error **err) +static void qmp_change_vnc_listen(const char *target, Error **errp) { - if (vnc_display_open(NULL, target) < 0) { - error_set(err, QERR_VNC_SERVER_FAILED, target); - } + vnc_display_open(NULL, target, errp); } static void qmp_change_vnc(const char *target, bool has_arg, const char *arg, diff --git a/ui/vnc.c b/ui/vnc.c index 6da265f..1989620 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3051,19 +3051,17 @@ int vnc_display_open(DisplayState *ds, const char *display) if (reverse) { /* connect to viewer */ - if (strncmp(display, "unix:", 5) == 0) - vs->lsock = unix_connect(display+5, NULL); - else - vs->lsock = inet_connect(display, NULL); - if (vs->lsock < 0) { - goto fail; + int csock; + vs->lsock = -1; + if (strncmp(display, "unix:", 5) == 0) { + csock = unix_connect(display+5, NULL); } else { - int csock = vs->lsock; - vs->lsock = -1; - vnc_connect(vs, csock, 0); + csock = inet_connect(display, NULL); } - return 0; - + if (csock < 0) { + goto fail; + } + vnc_connect(vs, csock, 0); } else { /* listen for connects */ char *dpy;