From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:47063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TPCiX-0007dR-03 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TPCiN-0006iU-DZ for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:24 -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 1TPCiN-0005yp-75 for qemu-devel@nongnu.org; Fri, 19 Oct 2012 09:34:15 -0400 Received: by mail-pa0-f45.google.com with SMTP id fb10so369528pad.4 for ; Fri, 19 Oct 2012 06:34:14 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Fri, 19 Oct 2012 15:32:01 +0200 Message-Id: <1350653528-5834-23-git-send-email-pbonzini@redhat.com> In-Reply-To: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> References: <1350653528-5834-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 22/29] vnc: drop QERR_VNC_SERVER_FAILED List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org We now always return "nice" error messages in errp when we goto fail. Drop the default error message. Signed-off-by: Paolo Bonzini --- qerror.h | 3 --- ui/vnc.c | 3 --- 2 file modificati, 6 rimozioni(-) diff --git a/qerror.h b/qerror.h index c91708c..f23b978 100644 --- a/qerror.h +++ b/qerror.h @@ -237,9 +237,6 @@ void assert_no_error(Error *err); #define QERR_VIRTFS_FEATURE_BLOCKS_MIGRATION \ ERROR_CLASS_GENERIC_ERROR, "Migration is disabled when VirtFS export path '%s' is mounted in the guest using mount_tag '%s'" -#define QERR_VNC_SERVER_FAILED \ - ERROR_CLASS_GENERIC_ERROR, "Could not start VNC server on %s" - #define QERR_SOCKET_CONNECT_FAILED \ ERROR_CLASS_GENERIC_ERROR, "Failed to connect to socket" diff --git a/ui/vnc.c b/ui/vnc.c index ce7f5b7..79f1922 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3086,9 +3086,6 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp) return; fail: - if (!error_is_set(errp)) { - error_set(errp, QERR_VNC_SERVER_FAILED, display); - } g_free(vs->display); vs->display = NULL; } -- 1.7.12.1