diff --git a/kvm.conf b/kvm.conf new file mode 100644 index 0000000..594b2f1 --- /dev/null +++ b/kvm.conf @@ -0,0 +1,12 @@ +### +### This configuration file was provided by the qemu package. +### Feel free to update as needed. +### + +### +### Set these options to enable nested virtualization +### + +#option kvm_intel nested=1 +#option kvm_amd nested=1 + diff --git a/qemu.spec b/qemu.spec index 7417742..995bd41 100644 --- a/qemu.spec +++ b/qemu.spec @@ -40,7 +40,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 2.5.0 -Release: 1%{?dist} +Release: 2 Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD Group: Development/Tools @@ -68,6 +68,9 @@ Source12: bridge.conf # qemu-kvm back compat wrapper Source13: qemu-kvm.sh +# For modprobe.d +Source20: kvm.conf + BuildRequires: SDL2-devel BuildRequires: zlib-devel BuildRequires: which @@ -633,6 +636,8 @@ install -D -p -m 0644 %{_sourcedir}/ksmtuned.service %{buildroot}%{_unitdir} install -D -p -m 0755 %{_sourcedir}/ksmtuned %{buildroot}%{_sbindir}/ksmtuned install -D -p -m 0644 %{_sourcedir}/ksmtuned.conf %{buildroot}%{_sysconfdir}/ksmtuned.conf +install -D -p -m 0644 %{_sourcedir}/kvm.conf %{buildroot}%{_sysconfdir}/modprobe.d/kvm.conf + # Install qemu-guest-agent service and udev rules install -m 0644 %{_sourcedir}/qemu-guest-agent.service %{buildroot}%{_unitdir} install -m 0644 %{_sourcedir}/99-qemu-guest-agent.rules %{buildroot}%{_udevdir} @@ -882,7 +887,8 @@ getent passwd qemu >/dev/null || \ %{_mandir}/man1/virtfs-proxy-helper.1* %{_bindir}/virtfs-proxy-helper %attr(4755, root, root) %{_libexecdir}/qemu-bridge-helper -%config(noreplace) %{_sysconfdir}/sasl2/qemu.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/kvm.conf +%config(noreplace) %{_sysconfdir}/ksmtuned.conf %dir %{_sysconfdir}/qemu %config(noreplace) %{_sysconfdir}/qemu/bridge.conf @@ -1158,6 +1164,9 @@ getent passwd qemu >/dev/null || \ %changelog +* Thu Jan 7 2015 Paolo Bonzini - 2:2.5.0-2 +- add /etc/modprobe.d/kvm.conf + * Wed Dec 23 2015 Cole Robinson 2:2.5.0-1 - Rebased to version 2.5.0