From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 19 Oct 2012 09:34:18 +0000 (+0200)
Subject: vnc: drop QERR_VNC_SERVER_FAILED
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3f8b11bc7d86a1952311565f089063d544d5a2f7;p=qemu.git

vnc: drop QERR_VNC_SERVER_FAILED

We now always return "nice" error messages in errp when we goto fail.
Drop the default error message.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/qerror.h b/qerror.h
index c91708cc3c..f23b97892d 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 93775694b2..d0ffcc54af 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3088,9 +3088,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;
 }