Patchwork [12/18] qemu-ga: ask and print error information from qemu-sockets

login
register
mail settings
Submitter Paolo Bonzini
Date Oct. 3, 2012, 2:36 p.m.
Message ID <1349275025-5093-13-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/188805/
State New
Headers show

Comments

Paolo Bonzini - Oct. 3, 2012, 2:36 p.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qga/channel-posix.c | 8 +++++---
 1 file modificato, 5 inserzioni(+), 3 rimozioni(-)
Luiz Capitulino - Oct. 4, 2012, 8:21 p.m.
On Wed,  3 Oct 2012 16:36:59 +0200
Paolo Bonzini <pbonzini@redhat.com> wrote:

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

Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

> ---
>  qga/channel-posix.c | 8 +++++---
>  1 file modificato, 5 inserzioni(+), 3 rimozioni(-)
> 
> diff --git a/qga/channel-posix.c b/qga/channel-posix.c
> index e22eee6..d152827 100644
> --- a/qga/channel-posix.c
> +++ b/qga/channel-posix.c
> @@ -181,9 +181,11 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod
>          break;
>      }
>      case GA_CHANNEL_UNIX_LISTEN: {
> -        int fd = unix_listen(path, NULL, strlen(path), NULL);
> -        if (fd == -1) {
> -            g_critical("error opening path: %s", strerror(errno));
> +        Error *local_err = NULL;
> +        int fd = unix_listen(path, NULL, strlen(path), &local_err);
> +        if (local_err != NULL) {
> +            g_critical("%s", error_get_pretty(local_err));
> +            error_free(local_err);
>              return false;
>          }
>          ga_channel_listen_add(c, fd, true);

Patch

diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index e22eee6..d152827 100644
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -181,9 +181,11 @@  static gboolean ga_channel_open(GAChannel *c, const gchar *path, GAChannelMethod
         break;
     }
     case GA_CHANNEL_UNIX_LISTEN: {
-        int fd = unix_listen(path, NULL, strlen(path), NULL);
-        if (fd == -1) {
-            g_critical("error opening path: %s", strerror(errno));
+        Error *local_err = NULL;
+        int fd = unix_listen(path, NULL, strlen(path), &local_err);
+        if (local_err != NULL) {
+            g_critical("%s", error_get_pretty(local_err));
+            error_free(local_err);
             return false;
         }
         ga_channel_listen_add(c, fd, true);