commit 3f8b11bc7d86a1952311565f089063d544d5a2f7
author Paolo Bonzini <pbonzini@redhat.com> Fri Oct 19 11:34:18 2012 +0200
committer Paolo Bonzini <pbonzini@redhat.com> Tue Oct 23 13:54:57 2012 +0200
tree 3fbbfd96ab76b3ff8abe23172808e650914f2d08
parent 58899664de29c250229f8d306fcf04f852cf5cc6

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>

qerror.h

diff --git a/qerror.h b/qerror.h
index c91708c..f23b978 100644
--- a/qerror.h
+++ b/qerror.h
@@ -237,9 +237,6 @@
 #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"
 

ui/vnc.c

diff --git a/ui/vnc.c b/ui/vnc.c
index 9377569..d0ffcc5 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3088,9 +3088,6 @@
     return;
 
 fail:
-    if (!error_is_set(errp)) {
-        error_set(errp, QERR_VNC_SERVER_FAILED, display);
-    }
     g_free(vs->display);
     vs->display = NULL;
 }