[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 22/29] vnc: drop QERR_VNC_SERVER_FAILED
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 22/29] vnc: drop QERR_VNC_SERVER_FAILED |
Date: |
Fri, 19 Oct 2012 15:32:01 +0200 |
We now always return "nice" error messages in errp when we goto fail.
Drop the default error message.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- [Qemu-devel] [PATCH 26/29] qemu-sockets: add socket_listen, socket_connect, socket_parse, (continued)
- [Qemu-devel] [PATCH 26/29] qemu-sockets: add socket_listen, socket_connect, socket_parse, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 12/29] qemu-ga: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 29/29] qmp: add NBD server commands, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 13/29] vnc: avoid Yoda conditionals, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 24/29] qapi: add socket address types, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 28/29] block: add close notifiers, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 09/29] migration (incoming): add error propagation to fd and exec protocols, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 10/29] qemu-char: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 18/29] qemu-sockets: add error propagation to inet_connect_addr, Paolo Bonzini, 2012/10/19
- [Qemu-devel] [PATCH 22/29] vnc: drop QERR_VNC_SERVER_FAILED,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 17/29] qemu-sockets: include strerror or gai_strerror output in error messages, Paolo Bonzini, 2012/10/19
- Re: [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server, Markus Armbruster, 2012/10/22
- Re: [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server, Anthony Liguori, 2012/10/22
- Re: [Qemu-devel] [PULL 00/29] qemu-sockets error propagation + NBD server, Anthony Liguori, 2012/10/26