[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 11/25] nbd: ask and print error information from
From: |
Markus Armbruster |
Subject: |
Re: [Qemu-devel] [PATCH 11/25] nbd: ask and print error information from qemu-sockets |
Date: |
Wed, 17 Oct 2012 16:51:16 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.1 (gnu/linux) |
Paolo Bonzini <address@hidden> writes:
> Before:
>
> $ qemu-system-x86_64 nbd:localhost:12345
> inet_connect_opts: connect(ipv4,yakj.usersys.redhat.com,127.0.0.1,12345):
> Connection refused
> qemu-system-x86_64: could not open disk image nbd:localhost:12345:
> Connection refused
>
> After:
>
> $ x86_64-softmmu/qemu-system-x86_64 nbd:localhost:12345
> qemu-system-x86_64: Failed to connect to socket: Connection refused
> qemu-system-x86_64: could not open disk image nbd:localhost:12345:
> Connection refused
>
> Signed-off-by: Paolo Bonzini <address@hidden>
> ---
> nbd.c | 39 +++++++++++++++++++++++++++++++--------
> 1 file modificato, 31 inserzioni(+), 8 rimozioni(-)
>
> diff --git a/nbd.c b/nbd.c
> index f61a288..cec5a94 100644
> --- a/nbd.c
> +++ b/nbd.c
> @@ -208,7 +208,14 @@ int tcp_socket_outgoing(const char *address, uint16_t
> port)
>
> int tcp_socket_outgoing_spec(const char *address_and_port)
> {
> - return inet_connect(address_and_port, NULL);
> + Error *local_err = NULL;
> + int fd = inet_connect(address_and_port, &local_err);
> +
> + if (local_err != NULL) {
> + qerror_report_err(local_err);
> + error_free(local_err);
> + }
> + return fd;
> }
>
> int tcp_socket_incoming(const char *address, uint16_t port)
> @@ -220,22 +227,38 @@ int tcp_socket_incoming(const char *address, uint16_t
> port)
>
> int tcp_socket_incoming_spec(const char *address_and_port)
> {
> - char *ostr = NULL;
> - int olen = 0;
> - return inet_listen(address_and_port, ostr, olen, SOCK_STREAM, 0, NULL);
> + Error *local_err = NULL;
> + int fd = inet_listen(address_and_port, NULL, 0, SOCK_STREAM, 0,
> &local_err);
> +
> + if (local_err != NULL) {
> + qerror_report_err(local_err);
> + error_free(local_err);
> + }
> + return fd;
> }
>
> int unix_socket_incoming(const char *path)
> {
> - char *ostr = NULL;
> - int olen = 0;
> + Error *local_err = NULL;
> + int fd = unix_listen(path, NULL, 0, &local_err);
>
> - return unix_listen(path, ostr, olen, NULL);
> + if (local_err != NULL) {
> + qerror_report_err(local_err);
> + error_free(local_err);
> + }
> + return fd;
> }
>
> int unix_socket_outgoing(const char *path)
> {
> - return unix_connect(path, NULL);
> + Error *local_err = NULL;
> + int fd = unix_connect(path, &local_err);
> +
> + if (local_err != NULL) {
> + qerror_report_err(local_err);
> + error_free(local_err);
> + }
> + return fd;
> }
>
> /* Basic flow for negotiation
The boilerplate pattern
Error *local_err = NULL;
FOO(..., *local_err);
if (local_err) {
qerror_report_err(local_err);
error_free(local_err);
}
is spreading. Not quite sure it's worth a macro.
- Re: [Qemu-devel] [PATCH 08/25] migration (outgoing): add error propagation for all protocols, (continued)
[Qemu-devel] [PATCH 12/25] qemu-ga: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 13/25] vnc: add error propagation to vnc_display_open, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 10/25] qemu-char: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 11/25] nbd: ask and print error information from qemu-sockets, Paolo Bonzini, 2012/10/10
- Re: [Qemu-devel] [PATCH 11/25] nbd: ask and print error information from qemu-sockets,
Markus Armbruster <=
[Qemu-devel] [PATCH 16/25] qemu-sockets: add error propagation to inet_dgram_opts, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 22/25] qemu-sockets: add socket_listen, socket_connect, socket_parse, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 23/25] block: add close notifiers, Paolo Bonzini, 2012/10/10
[Qemu-devel] [PATCH 24/25] qmp: add NBD server commands, Paolo Bonzini, 2012/10/10