Revision 25bce647 lib/hypervisor/hv_kvm.py

b/lib/hypervisor/hv_kvm.py
2023 2023

  
2024 2024
    """
2025 2025
    result = self.GetLinuxNodeInfo()
2026
    # FIXME: this is the global kvm version, but the actual version can be
2027
    # customized as an hv parameter. we should use the nodegroup's default kvm
2028
    # path parameter here.
2029
    _, v_major, v_min, v_rev = self._GetKVMVersion(constants.KVM_PATH)
2026
    kvmpath = constants.KVM_PATH
2027
    if hvparams is not None:
2028
      kvmpath = hvparams.get(constants.HV_KVM_PATH, constants.KVM_PATH)
2029
    _, v_major, v_min, v_rev = self._GetKVMVersion(kvmpath)
2030 2030
    result[constants.HV_NODEINFO_KEY_VERSION] = (v_major, v_min, v_rev)
2031 2031
    return result
2032 2032

  
......
2080 2080

  
2081 2081
    """
2082 2082
    msgs = []
2083
    # FIXME: this is the global kvm binary, but the actual path can be
2084
    # customized as an hv parameter; we should use the nodegroup's
2085
    # default kvm path parameter here.
2086
    if not os.path.exists(constants.KVM_PATH):
2087
      msgs.append("The KVM binary ('%s') does not exist" % constants.KVM_PATH)
2083
    kvmpath = constants.KVM_PATH
2084
    if hvparams is not None:
2085
      kvmpath = hvparams.get(constants.HV_KVM_PATH, constants.KVM_PATH)
2086
    if not os.path.exists(kvmpath):
2087
      msgs.append("The KVM binary ('%s') does not exist" % kvmpath)
2088 2088
    if not os.path.exists(constants.SOCAT_PATH):
2089 2089
      msgs.append("The socat binary ('%s') does not exist" %
2090 2090
                  constants.SOCAT_PATH)

Also available in: Unified diff