1 Author: Iustin Pop <iustin@debian.org>
2 Description: Fix obsolete -disable-kvm usage
3 This is already a bug upstream, but pending proper fixing (per version keying,
4 etc.), let's just use the correct version that will be shipped in Wheezy.
5 Bug: https://code.google.com/p/ganeti/issues/detail?id=250
6 Last-Update: 2012-07-26
7 --- a/lib/hypervisor/hv_kvm.py
8 +++ b/lib/hypervisor/hv_kvm.py
10 _SPICE_RE = re.compile(r"^-spice\s", re.M)
11 _VHOST_RE = re.compile(r"^-net\s.*,vhost=on|off", re.M)
12 _ENABLE_KVM_RE = re.compile(r"^-enable-kvm\s", re.M)
13 - _DISABLE_KVM_RE = re.compile(r"^-disable-kvm\s", re.M)
14 + _DISABLE_KVM_RE = re.compile(r"^-no-kvm\s", re.M)
15 _NETDEV_RE = re.compile(r"^-netdev\s", re.M)
16 _DISPLAY_RE = re.compile(r"^-display\s", re.M)
17 _MACHINE_RE = re.compile(r"^-machine\s", re.M)
19 kvm_cmd.extend(["-enable-kvm"])
20 elif (hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED and
21 self._DISABLE_KVM_RE.search(kvmhelp)):
22 - kvm_cmd.extend(["-disable-kvm"])
23 + kvm_cmd.extend(["-no-kvm"])
25 kernel_path = hvp[constants.HV_KERNEL_PATH]