From: Richard W.M. Jones <rjones@redhat.com>
Date: Tue, 23 Aug 2011 17:53:38 +0000 (+0100)
Subject: test_qemu: Improve the error message.
X-Git-Tag: 1.12.5~17
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=622ebf688e6ad18fd7d7c6f7f3c64c6bd7d5c903;p=libguestfs.git

test_qemu: Improve the error message.

Note that errno is probably not set to a useful value here, so there
is not much point recording it.
(cherry picked from commit f15961911316460f7d45342d63c2d784a483f0d1)
---

diff --git a/src/launch.c b/src/launch.c
index 11d1acf..03ad39b 100644
--- a/src/launch.c
+++ b/src/launch.c
@@ -1083,7 +1083,8 @@ test_qemu (guestfs_h *g)
    * probably indicates that the qemu binary is missing.
    */
   if (test_qemu_cmd (g, cmd, &g->qemu_help) == -1) {
-    perrorf (g, _("%s: command failed: If qemu is located on a non-standard path, try setting the LIBGUESTFS_QEMU environment variable."), cmd);
+    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);
     return -1;
   }