Revision ffc27116

b/lib/constants.py
950 950
HV_KVM_PATH = "kvm_path"
951 951
HV_VIF_TYPE = "vif_type"
952 952
HV_VNET_HDR = "vnet_hdr"
953
HV_VIRIDIAN = "viridian"
953 954

  
954 955

  
955 956
HVS_PARAMETER_TYPES = {
......
1021 1022
  HV_KVM_MACHINE_VERSION: VTYPE_STRING,
1022 1023
  HV_VIF_TYPE: VTYPE_STRING,
1023 1024
  HV_VNET_HDR: VTYPE_BOOL,
1025
  HV_VIRIDIAN: VTYPE_BOOL,
1024 1026
  }
1025 1027

  
1026 1028
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
......
2047 2049
    HV_CPU_CAP: 0,
2048 2050
    HV_CPU_WEIGHT: 256,
2049 2051
    HV_VIF_TYPE: HT_HVM_VIF_IOEMU,
2052
    HV_VIRIDIAN: False,
2050 2053
    },
2051 2054
  HT_KVM: {
2052 2055
    HV_KVM_PATH: KVM_PATH,
b/lib/hypervisor/hv_xen.py
926 926
      (False, lambda x: 0 < x < 65535, "invalid weight", None, None),
927 927
    constants.HV_VIF_TYPE:
928 928
      hv_base.ParamInSet(False, constants.HT_HVM_VALID_VIF_TYPES),
929
    constants.HV_VIRIDIAN: hv_base.NO_CHECK,
929 930
    }
930 931

  
931 932
  def _GetConfig(self, instance, startup_memory, block_devices):
......
963 964
      config.write("acpi = 1\n")
964 965
    else:
965 966
      config.write("acpi = 0\n")
967
    if hvp[constants.HV_VIRIDIAN]:
968
      config.write("viridian = 1\n")
969
    else:
970
      config.write("viridian = 0\n")
971

  
966 972
    config.write("apic = 1\n")
967 973
    config.write("device_model = '%s'\n" % hvp[constants.HV_DEVICE_MODEL])
968 974
    config.write("boot = '%s'\n" % hvp[constants.HV_BOOT_ORDER])

Also available in: Unified diff