summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/launch.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/launch.c b/src/launch.c
index 0317875e..86e1bc56 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1385,8 +1385,8 @@ test_qemu (guestfs_h *g)
*/
if (test_qemu_cmd (g, cmd, &g->qemu_help) == -1) {
qemu_error:
- 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;
}
@@ -1442,10 +1442,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;
}