launch: Ensure errno from test_qemu_cmd is captured and printed.

(cherry picked from commit 9e221e55b61e9f1cd0caf292ca609a4ca26f1d4d)

1 files changed, 3 insertions, 5 deletions

diff --git a/src/launch.c b/src/launch.c
index 152b4d97..34c13a0b 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1288,8 +1288,8 @@ test_qemu (guestfs_h *g)
    * probably indicates that the qemu binary is missing.
    */
   if (test_qemu_cmd (g, cmd, &g->qemu_help) == -1) {
-    error (g, _("command failed: %s\n\nIf qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\nenvironment variable.  There may also be errors printed above."),
-           cmd);
+    error (g, _("command failed: %s\nerrno: %s\n\nIf qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU\nenvironment variable.  There may also be errors printed above."),
+           cmd, strerror (errno));
     return -1;
   }
 
@@ -1338,10 +1338,8 @@ read_all (guestfs_h *g, FILE *fp, char **ret)
   *ret = safe_realloc (g, *ret, n + BUFSIZ);
   p = &(*ret)[n];
   r = fread (p, 1, BUFSIZ, fp);
-  if (ferror (fp)) {
-    perrorf (g, "read");
+  if (ferror (fp))
     return -1;
-  }
   n += r;
   goto again;
 }