[gentoo-commits] gentoo-x86 commit in app-emulation/ganeti/files: ganeti-2.11-qemu-enable-kvm.patch ganeti-2.11-tests.patch

[gentoo-commits] gentoo-x86 commit in app-emulation/ganeti/files: ganeti-2.11-qemu-enable-kvm.patch ganeti-2.11-tests.patch

[Patrick McLean (chutzpah)]

chutzpah    14/06/14 00:11:44

  Added:                ganeti-2.11-qemu-enable-kvm.patch
                        ganeti-2.11-tests.patch
  Log:
  Version bump, add some hackery to work around app-emulation/qemu removing the qemu-kvm wrapper.
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xE3F69979BB4B8928DA78E3D17CBF44EF)

Revision  Changes    Path
1.1                  app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-qemu-enable-kvm.patch?rev=1.1&content-type=text/plain

Index: ganeti-2.11-qemu-enable-kvm.patch
===================================================================
diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py
index b61be65..100aafd 100644
--- a/lib/hypervisor/hv_kvm.py
+++ b/lib/hypervisor/hv_kvm.py
@@ -1380,6 +1380,7 @@ class KVMHypervisor(hv_base.BaseHypervisor):
     kvm = hvp[constants.HV_KVM_PATH]
     kvm_cmd = [kvm]
     # used just by the vnc server, if enabled
+    kvm_cmd.extend(["-enable-kvm"])
     kvm_cmd.extend(["-name", instance.name])
     kvm_cmd.extend(["-m", instance.beparams[constants.BE_MAXMEM]])
 



1.1                  app-emulation/ganeti/files/ganeti-2.11-tests.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/ganeti/files/ganeti-2.11-tests.patch?rev=1.1&content-type=text/plain

Index: ganeti-2.11-tests.patch
===================================================================
diff --git a/test/py/ganeti-cleaner_unittest.bash b/test/py/ganeti-cleaner_unittest.bash
index bf57b76..ee3b90d 100755
--- a/test/py/ganeti-cleaner_unittest.bash
+++ b/test/py/ganeti-cleaner_unittest.bash
@@ -219,7 +219,7 @@ count_and_check_certs 10
 run_cleaner master
 count_and_check_certs 10
 run_cleaner node
-count_and_check_certs 5
+count_and_check_certs 10
 
 check_logfiles $maxlog node
 check_logfiles $maxlog master