diff --git a/qemu-kvm.sh b/qemu-kvm.sh deleted file mode 100644 index 87cf89c..0000000 --- a/qemu-kvm.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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-x86_64 $opts "$@" diff --git a/qemu.spec b/qemu.spec index 635e12e..5b21232 100644 --- a/qemu.spec +++ b/qemu.spec @@ -161,7 +161,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 4.2.1 -Release: 1%{?rcrel}%{?dist} +Release: 2%{?rcrel}%{?dist} Epoch: 2 License: GPLv2 and BSD and MIT and CC-BY URL: http://www.qemu.org/ @@ -175,8 +175,6 @@ Source17: qemu-ga.sysconfig Source11: 99-qemu-guest-agent.rules # /etc/qemu/bridge.conf Source12: bridge.conf -# qemu-kvm back compat wrapper installed as /usr/bin/qemu-kvm -Source13: qemu-kvm.sh # PR manager service Source14: qemu-pr-helper.service Source15: qemu-pr-helper.socket @@ -1332,7 +1330,7 @@ done # Install kvm specific source bits, and qemu-kvm manpage %if 0%{?need_qemu_kvm} ln -sf qemu.1.gz %{buildroot}%{_mandir}/man1/qemu-kvm.1.gz -install -m 0755 %{_sourcedir}/qemu-kvm.sh %{buildroot}%{_bindir}/qemu-kvm +ln -sf qemu-system-x86_64 %{buildroot}%{_bindir}/qemu-kvm install -D -p -m 0644 %{_sourcedir}/kvm-x86.modprobe.conf %{buildroot}%{_sysconfdir}/modprobe.d/kvm.conf %endif @@ -2002,6 +2000,10 @@ getent passwd qemu >/dev/null || \ %changelog + +* Mon Jan 11 2021 Paolo Bonzini - 4.2.1-2 +- Use symlink for qemu-kvm. + * Fri Jun 26 2020 Cole Robinson - 4.2.1-1 - Update to version 4.2.1