[Pkg-libvirt-commits] [libguestfs] 45/59: test-tool: Map powerpc64 -> ppc64 when searching for qemu.

Hilko Bengen bengen at moszumanska.debian.org
Wed Nov 26 22:04:06 UTC 2014


This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit bdf20e0ad88a6a12196db193fa5b13b1d8fcc601
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Nov 6 15:15:39 2014 +0000

    test-tool: Map powerpc64 -> ppc64 when searching for qemu.
    
    Consequence of the previous commit.
    
    This also adjusts the whitespace to make the generated script
    a bit nicer.
    
    (cherry picked from commit bd589a1d53c5192daf40da0cc7f5809c7e4fa0ca)
---
 test-tool/test-tool.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test-tool/test-tool.c b/test-tool/test-tool.c
index 848571d..f3eb59d 100644
--- a/test-tool/test-tool.c
+++ b/test-tool/test-tool.c
@@ -389,14 +389,16 @@ set_qemu (guestfs_h *g, const char *path, int use_wrapper)
            "host_cpu=%s\n"
            "qemudir='%s'\n"
            "case $host_cpu in\n"
-           "    amd64*) qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-x86_64\"\n"
-           "            ;;\n"
+           "    amd64*)\n"
+           "          qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-x86_64\"\n"
+           "          ;;\n"
            "    arm*) qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-arm\"\n"
            "          ;;\n"
-           "    ppc64le) qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-ppc64\"\n"
-           "             ;;\n"
-           "    *) qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-$host_cpu\"\n"
-           "       ;;\n"
+           "    powerpc64|ppc64le)\n"
+           "          qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-ppc64\"\n"
+           "          ;;\n"
+           "    *)    qemu=\"$qemudir/$host_cpu-softmmu/qemu-system-$host_cpu\"\n"
+           "          ;;\n"
            "esac\n"
            "exec \"$qemu\" -L \"$qemudir/pc-bios\" \"$@\"\n",
            host_cpu, path);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git



More information about the Pkg-libvirt-commits mailing list