Skip to contentSkip to conversation

qga: add channel path to error messages

PATCH In review Bjørn Forsman 3 participants 5 messages Oct 20, 2022 – Oct 26, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qga: add channel path to error messages

It's useful to know which device was used if/when it fails.

channel-win32.c had this since 2015, with c69403fcd4a0cb89f838a212ab71e4a1a3464c95 ("qemu-ga: debug printouts to help troubleshoot installation"), this brings channel-posix.c up to speed.

---
 qga/channel-posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qga/channel-posix.c +2 -2
index 6796a02cff..e6dce985ae 100644
@@ -138,7 +138,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path,
             0
         );
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'", path);
             return false;
         }
 #ifdef CONFIG_SOLARIS
@@ -163,7 +163,7 @@ static gboolean ga_channel_open(GAChannel *c, const gchar *path,
         assert(fd < 0);
         fd = qga_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0);
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'", path);
             return false;
         }
         tcgetattr(fd, &tio);
Signature · 1 line
2.36.2
#1 lore raw

Hi

Quoted 38 lines · Bjørn Forsman

It's useful to know which device was used if/when it fails.

channel-win32.c had this since 2015, with c69403fcd4a0cb89f838a212ab71e4a1a3464c95 ("qemu-ga: debug printouts to help troubleshoot installation"), this brings channel-posix.c up to speed.

---
 qga/channel-posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qga/channel-posix.c +1 -1
index 6796a02cff..e6dce985ae 100644
@@ -138,7 +138,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
             0
         );
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }

#ifdef CONFIG_SOLARIS

qga/channel-posix.c +1 -1
@@ -163,7 +163,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
         assert(fd < 0);
         fd = qga_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0);
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }
         tcgetattr(fd, &tio);
Quoted 5 lines

--
2.36.2

Wouldn't it be simpler to modify the g_critical() in ga_channel_new() instead?

    if (!ga_channel_open(c, path, method, listen_fd, &err)) {
        g_critical("Failed to open %s: %s", path, error_get_pretty(err));

...

Signature · 1 line
Marc-André Lureau
#2 lore raw
Quoted 5 lines · Marc-André Lureau

[...]
Wouldn't it be simpler to modify the g_critical() in ga_channel_new() instead?

    if (!ga_channel_open(c, path, method, listen_fd, &err)) {
        g_critical("Failed to open %s: %s", path, error_get_pretty(err));

Sounds like a good idea -- it's a more central place.

However, I'm hesitant about doing that now:
* This patch just syncs channel-posix.c up with channel-win32.c.
* I don't have a way to test the windows code so I'd rather not touch it (which I think one should do to keep the win32/posix files mostly in sync).
* My test iteration time on this code is quite slow.
* I'm a noob -- first time submitter.

Can we merge as-is please?

/Bjørn

Reviewed-by on v1 1/1
#3 lore raw
In reply to Bjørn Forsman
Quoted 42 lines · Bjørn Forsman

It's useful to know which device was used if/when it fails.

channel-win32.c had this since 2015, with c69403fcd4a0cb89f838a212ab71e4a1a3464c95 ("qemu-ga: debug printouts to help troubleshoot installation"), this brings channel-posix.c up to speed.

---
 qga/channel-posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qga/channel-posix.c +1 -1
index 6796a02cff..e6dce985ae 100644
@@ -138,7 +138,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
             0
         );
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }

#ifdef CONFIG_SOLARIS

qga/channel-posix.c +1 -1
@@ -163,7 +163,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
         assert(fd < 0);
         fd = qga_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0);
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }
         tcgetattr(fd, &tio);

--
2.36.2

#4 lore raw

PR was sent
https://patchew.org/QEMU/[email protected]/

Quoted 47 lines · Konstantin Kostiuk
Quoted 42 lines · Bjørn Forsman

It's useful to know which device was used if/when it fails.

channel-win32.c had this since 2015, with c69403fcd4a0cb89f838a212ab71e4a1a3464c95 ("qemu-ga: debug printouts to help troubleshoot installation"), this brings channel-posix.c up to speed.

---
 qga/channel-posix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
qga/channel-posix.c +1 -1
index 6796a02cff..e6dce985ae 100644
@@ -138,7 +138,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
             0
         );
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }

#ifdef CONFIG_SOLARIS

qga/channel-posix.c +1 -1
@@ -163,7 +163,7 @@ static gboolean ga_channel_open(GAChannel *c, const
 gchar *path,
         assert(fd < 0);
         fd = qga_open_cloexec(path, O_RDWR | O_NOCTTY | O_NONBLOCK, 0);
         if (fd == -1) {
-            error_setg_errno(errp, errno, "error opening channel");
+            error_setg_errno(errp, errno, "error opening channel '%s'",
 path);
             return false;
         }
         tcgetattr(fd, &tio);

--
2.36.2