qemu-kvm depends on the host architecture - install only one we really need

Makefile

@@ -29,7 +29,9 @@ x86_64: bridge-netdev
 	$(MAKE) -C qemu-4.1.1 install
 	rm -rf qemu-4.1.1
 
-	install -v -m755 qemu-kvm /usr/bin/qemu-kvm
+	if [ `uname -m` = 'x86_64' ] ; then \
+	    install -v -m755 qemu-kvm-x86_64 /usr/bin/qemu-kvm ; \
+	fi
 
 	swapoff swap
 	rm -rf swap
@@ -67,6 +69,10 @@ aarch64: bridge-netdev
 	$(MAKE) -C qemu-4.1.1 install
 	rm -rf qemu-4.1.1
 
+	if [ `uname -m` = 'aarch64' ] ; then \
+	    install -v -m755 qemu-kvm-aarch64 /usr/bin/qemu-kvm ; \
+	fi
+
 	swapoff swap
 	rm -rf swap
 

qemu-kvm-aarch64

+#!/bin/sh
+
+# Libvirt introspects the binary using -M none. In that case, don't try
+# to init KVM, which will fail and be noisy if the host has kvm disabled
+opts="-machine accel=kvm"
+if echo "$@" | grep -q " -M none "; then
+    opts=
+fi
+
+exec /usr/bin/qemu-system-aarch64 $opts "$@"