qrap: Fix qemu name-guessing loop, add /usr/libexec/qemu-kvm as full path too

The name-guessing loop should iterate over names, not single
characters. Also add /usr/libexec/qemu-kvm as full path for
execvp(): execvp() won't find it if it's not in $PATH, which
is the reason why it shouldn't be under /usr/libexec/, but this
seems to be the case for some current version of Fedora.

Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/qrap.c b/qrap.c
index 7f27d47..afb14a5 100644
--- a/qrap.c
+++ b/qrap.c
@@ -33,6 +33,7 @@ static char *qemu_names[] = {
 #ifdef ARCH
 	"qemu-system-" ARCH,
 #endif
+	"/usr/libexec/qemu-kvm",
 	NULL,
 };
 
@@ -135,11 +136,11 @@ valid_args:
 	close(s);
 
 	if (qemu_argc) {
-		char *name;
+		char **name;
 
-		for (name = qemu_names[0]; name; name++) {
-			qemu_argv[0] = name;
-			execvp(name, qemu_argv);
+		for (name = qemu_names; *name; name++) {
+			qemu_argv[0] = *name;
+			execvp(*name, qemu_argv);
 			if (errno != ENOENT) {
 				perror("execvp");
 				usage(argv[0]);