Revision 7ba594c0
| b/lib/constants.py | ||
|---|---|---|
| 429 | 429 |
HV_DISK_CACHE = "disk_cache" |
| 430 | 430 |
HV_SECURITY_MODEL = "security_model" |
| 431 | 431 |
HV_SECURITY_DOMAIN = "security_domain" |
| 432 |
HV_KVM_FLAG = "kvm_flag" |
|
| 432 | 433 |
|
| 433 | 434 |
HVS_PARAMETER_TYPES = {
|
| 434 | 435 |
HV_BOOT_ORDER: VTYPE_STRING, |
| ... | ... | |
| 458 | 459 |
HV_DISK_CACHE: VTYPE_STRING, |
| 459 | 460 |
HV_SECURITY_MODEL: VTYPE_STRING, |
| 460 | 461 |
HV_SECURITY_DOMAIN: VTYPE_STRING, |
| 462 |
HV_KVM_FLAG: VTYPE_STRING, |
|
| 461 | 463 |
} |
| 462 | 464 |
|
| 463 | 465 |
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) |
| ... | ... | |
| 566 | 568 |
|
| 567 | 569 |
HT_KVM_VALID_SM_TYPES = frozenset([HT_SM_NONE, HT_SM_USER, HT_SM_POOL]) |
| 568 | 570 |
|
| 571 |
# Kvm flag values |
|
| 572 |
HT_KVM_ENABLED = "enabled" |
|
| 573 |
HT_KVM_DISABLED = "disabled" |
|
| 574 |
|
|
| 575 |
HT_KVM_FLAG_VALUES = frozenset([HT_KVM_ENABLED, HT_KVM_DISABLED]) |
|
| 576 |
|
|
| 569 | 577 |
# Cluster Verify steps |
| 570 | 578 |
VERIFY_NPLUSONE_MEM = 'nplusone_mem' |
| 571 | 579 |
VERIFY_OPTIONAL_CHECKS = frozenset([VERIFY_NPLUSONE_MEM]) |
| ... | ... | |
| 712 | 720 |
HV_DISK_CACHE: HT_CACHE_DEFAULT, |
| 713 | 721 |
HV_SECURITY_MODEL: HT_SM_NONE, |
| 714 | 722 |
HV_SECURITY_DOMAIN: '', |
| 723 |
HV_KVM_FLAG: "", |
|
| 715 | 724 |
}, |
| 716 | 725 |
HT_FAKE: {
|
| 717 | 726 |
}, |
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 80 | 80 |
constants.HV_SECURITY_MODEL: |
| 81 | 81 |
hv_base.ParamInSet(True, constants.HT_KVM_VALID_SM_TYPES), |
| 82 | 82 |
constants.HV_SECURITY_DOMAIN: hv_base.NO_CHECK, |
| 83 |
constants.HV_KVM_FLAG: |
|
| 84 |
hv_base.ParamInSet(False, constants.HT_KVM_FLAG_VALUES), |
|
| 83 | 85 |
} |
| 84 | 86 |
|
| 85 | 87 |
_MIGRATION_STATUS_RE = re.compile('Migration\s+status:\s+(\w+)',
|
| ... | ... | |
| 366 | 368 |
boot_cdrom = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_CDROM |
| 367 | 369 |
boot_network = hvp[constants.HV_BOOT_ORDER] == constants.HT_BO_NETWORK |
| 368 | 370 |
|
| 371 |
if hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_ENABLED: |
|
| 372 |
kvm_cmd.extend(["-enable-kvm"]) |
|
| 373 |
elif hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED: |
|
| 374 |
kvm_cmd.extend(["-disable-kvm"]) |
|
| 375 |
|
|
| 369 | 376 |
if boot_network: |
| 370 | 377 |
kvm_cmd.extend(['-boot', 'n']) |
| 371 | 378 |
|
| b/man/gnt-instance.sgml | ||
|---|---|---|
| 644 | 644 |
</listitem> |
| 645 | 645 |
</varlistentry> |
| 646 | 646 |
|
| 647 |
<varlistentry> |
|
| 648 |
<term>kvm_flag</term> |
|
| 649 |
<listitem> |
|
| 650 |
<simpara>Valid for the KVM hypervisor.</simpara> |
|
| 651 |
|
|
| 652 |
<simpara>If <quote>enabled</quote> the -enable-kvm flag is |
|
| 653 |
passed to kvm. If <quote>disabled</quote> -disable-kvm is |
|
| 654 |
passed. If unset no flag is passed, and the default running |
|
| 655 |
mode for your kvm binary will be used. |
|
| 656 |
</simpara> |
|
| 657 |
|
|
| 658 |
</listitem> |
|
| 659 |
</varlistentry> |
|
| 660 |
|
|
| 647 | 661 |
</variablelist> |
| 648 | 662 |
|
| 649 | 663 |
</para> |
Also available in: Unified diff