Revision 740394bc
b/lib/constants.py | ||
---|---|---|
944 | 944 |
HV_KVM_MACHINE_VERSION = "machine_version" |
945 | 945 |
HV_KVM_PATH = "kvm_path" |
946 | 946 |
HV_VIF_TYPE = "vif_type" |
947 |
HV_XEN_CMD = "xen_cmd" |
|
947 | 948 |
|
948 | 949 |
|
949 | 950 |
HVS_PARAMETER_TYPES = { |
... | ... | |
1014 | 1015 |
HV_KVM_EXTRA: VTYPE_STRING, |
1015 | 1016 |
HV_KVM_MACHINE_VERSION: VTYPE_STRING, |
1016 | 1017 |
HV_VIF_TYPE: VTYPE_STRING, |
1018 |
HV_XEN_CMD: VTYPE_STRING, |
|
1017 | 1019 |
} |
1018 | 1020 |
|
1019 | 1021 |
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) |
... | ... | |
2026 | 2028 |
HV_CPU_MASK: CPU_PINNING_ALL, |
2027 | 2029 |
HV_CPU_CAP: 0, |
2028 | 2030 |
HV_CPU_WEIGHT: 256, |
2031 |
HV_XEN_CMD: XEN_CMD_XM, |
|
2029 | 2032 |
}, |
2030 | 2033 |
HT_XEN_HVM: { |
2031 | 2034 |
HV_BOOT_ORDER: "cd", |
... | ... | |
2048 | 2051 |
HV_CPU_CAP: 0, |
2049 | 2052 |
HV_CPU_WEIGHT: 256, |
2050 | 2053 |
HV_VIF_TYPE: HT_HVM_VIF_IOEMU, |
2054 |
HV_XEN_CMD: XEN_CMD_XM, |
|
2051 | 2055 |
}, |
2052 | 2056 |
HT_KVM: { |
2053 | 2057 |
HV_KVM_PATH: KVM_PATH, |
b/lib/hypervisor/hv_xen.py | ||
---|---|---|
804 | 804 |
constants.HV_CPU_CAP: hv_base.OPT_NONNEGATIVE_INT_CHECK, |
805 | 805 |
constants.HV_CPU_WEIGHT: |
806 | 806 |
(False, lambda x: 0 < x < 65536, "invalid weight", None, None), |
807 |
constants.HV_XEN_CMD: |
|
808 |
hv_base.ParamInSet(True, constants.KNOWN_XEN_COMMANDS), |
|
807 | 809 |
} |
808 | 810 |
|
809 | 811 |
def _GetConfig(self, instance, startup_memory, block_devices): |
... | ... | |
926 | 928 |
(False, lambda x: 0 < x < 65535, "invalid weight", None, None), |
927 | 929 |
constants.HV_VIF_TYPE: |
928 | 930 |
hv_base.ParamInSet(False, constants.HT_HVM_VALID_VIF_TYPES), |
931 |
constants.HV_XEN_CMD: |
|
932 |
hv_base.ParamInSet(True, constants.KNOWN_XEN_COMMANDS), |
|
929 | 933 |
} |
930 | 934 |
|
931 | 935 |
def _GetConfig(self, instance, startup_memory, block_devices): |
Also available in: Unified diff