remove qemu-kvm script in favor of symlink
Since QEMU 4.0 upstream supported automatically favoring KVM if the executable ends with "kvm". Unlike the script that is currently in use, this allows the user to specify an alternative accelerator with "-accel". Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
130b985a3c
commit
74370c64ef
10
qemu-kvm.sh
10
qemu-kvm.sh
@ -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 "$@"
|
@ -219,7 +219,7 @@
|
||||
Summary: QEMU is a FAST! processor emulator
|
||||
Name: qemu
|
||||
Version: 5.2.0
|
||||
Release: 4%{?rcrel}%{?dist}
|
||||
Release: 5%{?rcrel}%{?dist}
|
||||
Epoch: 2
|
||||
License: GPLv2 and BSD and MIT and CC-BY
|
||||
URL: http://www.qemu.org/
|
||||
@ -233,8 +233,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
|
||||
# /etc/modprobe.d/kvm.conf, for x86
|
||||
Source20: kvm-x86.modprobe.conf
|
||||
# /etc/security/limits.d/95-kvm-ppc64-memlock.conf
|
||||
@ -1327,7 +1325,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
|
||||
|
||||
@ -1917,6 +1915,9 @@ getent passwd qemu >/dev/null || \
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jan 11 2021 Paolo Bonzini <pbonzini@redhat.com> - 2:5.2.0-5
|
||||
- Use symlink for qemu-kvm.
|
||||
|
||||
* Fri Dec 11 2020 Richard W.M. Jones <rjones@redhat.com> - 2:5.2.0-4
|
||||
- qemu-char-spice not qemu-chardev-spice.
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user