From 37ffcaef87e0ed0e438e3ccdc322a0708fe3b125 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Aug 18 2009 10:06:17 +0000 Subject: - Allow blacklisting of kvm modules (#517866) --- diff --git a/kvm.modules b/kvm.modules index ef633aa..ae22789 100755 --- a/kvm.modules +++ b/kvm.modules @@ -1,9 +1,9 @@ #!/bin/sh if [ $(grep -c vmx /proc/cpuinfo) -ne 0 ]; then - modprobe kvm-intel >/dev/null 2>&1 + modprobe -b kvm-intel >/dev/null 2>&1 fi if [ $(grep -c svm /proc/cpuinfo) -ne 0 ]; then - modprobe kvm-amd >/dev/null 2>&1 + modprobe -b kvm-amd >/dev/null 2>&1 fi diff --git a/qemu.spec b/qemu.spec index e500af0..eacd1b1 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.10.6 -Release: 1%{?dist} +Release: 2%{?dist} # Epoch because we pushed a qemu-1.0 package Epoch: 2 License: GPLv2+ and LGPLv2+ and BSD @@ -467,6 +467,9 @@ fi %{_mandir}/man1/qemu-img.1* %changelog +* Tue Aug 18 2009 Mark McLoughlin - 2:0.10.6-2 +- Allow blacklisting of kvm modules (#517866) + * Tue Aug 4 2009 Mark McLoughlin - 2:0.10.6-1 - Update to qemu-kvm-0.10.6; upstream ChangeLog: - merge qemu 0.10.6