rpms/qemu
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix kvm.modules to exit successfully on non-KVM capable systems

Browse Source 
Resolves rhbz #814932.
This commit is contained in:
Paolo Bonzini 2012-04-23 10:09:13 +02:00
parent 56753ff081
commit 34104a5fe7
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kvm.modules
View File

@ -1,10 +1,14 @@
#!/bin/sh #!/bin/sh
case "$(</proc/cpuinfo)" in grep vmx /proc/cpuinfo >/dev/null 2>&1 && vmx=1
*vmx*) vmx=1 ;; grep svm /proc/cpuinfo >/dev/null 2>&1 && svm=1
*svm*) svm=1 ;;
esac
[ "$vmx" ] && modprobe -b kvm-intel >/dev/null 2>&1 if [ "$vmx" ] || [ "$svm" ]; then
[ "$svm" ] && modprobe -b kvm-amd >/dev/null 2>&1 [ "$vmx" ] && modprobe -b kvm-intel >/dev/null 2>&1
[ "$vmx" -o "$svm" ] && modprobe -b vhost-net >/dev/null 2>&1 [ "$svm" ] && modprobe -b kvm-amd >/dev/null 2>&1
# no reason why vhost should not work with TCG, but currently it does not
modprobe -b vhost-net >/dev/null 2>&1
else
exit 0
fi

5
qemu.spec
View File

@ -38,7 +38,7 @@
Summary: QEMU is a FAST! processor emulator Summary: QEMU is a FAST! processor emulator
Name: qemu Name: qemu
Version: 1.0 Version: 1.0
Release: 15%{?dist} Release: 16%{?dist}
# Epoch because we pushed a qemu-1.0 package # Epoch because we pushed a qemu-1.0 package
Epoch: 2 Epoch: 2
License: GPLv2+ and LGPLv2+ and BSD License: GPLv2+ and LGPLv2+ and BSD
@ -1009,6 +1009,9 @@ fi
%{_mandir}/man1/qemu-img.1* %{_mandir}/man1/qemu-img.1*
%changelog %changelog
* Mon Apr 23 2012 Paolo Bonzini <pbonzini@redhat.com> - 2:1.0-16
- Fix kvm.modules to exit successfully on non-KVM capable systems (rhbz #814932)
* Thu Apr 19 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.0-15 * Thu Apr 19 2012 Hans de Goede <hdegoede@redhat.com> - 2:1.0-15
- Add a couple of backported QXL/Spice bugfixes - Add a couple of backported QXL/Spice bugfixes
- Add spice volume control patches - Add spice volume control patches