Revision c9ff267c
b/lib/constants.py | ||
---|---|---|
816 | 816 |
HV_MEM_PATH = "mem_path" |
817 | 817 |
HV_BLOCKDEV_PREFIX = "blockdev_prefix" |
818 | 818 |
HV_REBOOT_BEHAVIOR = "reboot_behavior" |
819 |
HV_KVM_MACHINE_VERSION = "machine_version" |
|
820 |
|
|
819 | 821 |
|
820 | 822 |
HVS_PARAMETER_TYPES = { |
821 | 823 |
HV_BOOT_ORDER: VTYPE_STRING, |
... | ... | |
870 | 872 |
HV_MEM_PATH: VTYPE_STRING, |
871 | 873 |
HV_BLOCKDEV_PREFIX: VTYPE_STRING, |
872 | 874 |
HV_REBOOT_BEHAVIOR: VTYPE_STRING, |
875 |
HV_KVM_MACHINE_VERSION: VTYPE_STRING, |
|
873 | 876 |
} |
874 | 877 |
|
875 | 878 |
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) |
... | ... | |
1873 | 1876 |
HV_MEM_PATH: "", |
1874 | 1877 |
HV_REBOOT_BEHAVIOR: INSTANCE_REBOOT_ALLOWED, |
1875 | 1878 |
HV_CPU_MASK: CPU_PINNING_ALL, |
1879 |
HV_KVM_MACHINE_VERSION: "", |
|
1876 | 1880 |
}, |
1877 | 1881 |
HT_FAKE: { |
1878 | 1882 |
}, |
b/lib/hypervisor/hv_kvm.py | ||
---|---|---|
496 | 496 |
constants.HV_REBOOT_BEHAVIOR: |
497 | 497 |
hv_base.ParamInSet(True, constants.REBOOT_BEHAVIORS), |
498 | 498 |
constants.HV_CPU_MASK: hv_base.OPT_MULTI_CPU_MASK_CHECK, |
499 |
constants.HV_KVM_MACHINE_VERSION: hv_base.NO_CHECK, |
|
499 | 500 |
} |
500 | 501 |
|
501 | 502 |
_MIGRATION_STATUS_RE = re.compile("Migration\s+status:\s+(\w+)", |
... | ... | |
1061 | 1062 |
pidfile = self._InstancePidFile(instance.name) |
1062 | 1063 |
kvm = constants.KVM_PATH |
1063 | 1064 |
kvm_cmd = [kvm] |
1064 |
kvm_cmd.extend(["-M", self._GetDefaultMachineVersion()]) |
|
1065 | 1065 |
# used just by the vnc server, if enabled |
1066 | 1066 |
kvm_cmd.extend(["-name", instance.name]) |
1067 | 1067 |
kvm_cmd.extend(["-m", instance.beparams[constants.BE_MAXMEM]]) |
... | ... | |
1076 | 1076 |
kvm_cmd.extend(["-no-reboot"]) |
1077 | 1077 |
|
1078 | 1078 |
hvp = instance.hvparams |
1079 |
mversion = hvp[constants.HV_KVM_MACHINE_VERSION] |
|
1080 |
if not mversion: |
|
1081 |
mversion = self._GetDefaultMachineVersion() |
|
1082 |
kvm_cmd.extend(["-M", mversion]) |
|
1079 | 1083 |
kernel_path = hvp[constants.HV_KERNEL_PATH] |
1080 | 1084 |
if kernel_path: |
1081 | 1085 |
boot_cdrom = boot_floppy = boot_network = False |
Also available in: Unified diff