Revision 8a534fbe
| b/lib/constants.py | ||
|---|---|---|
| 949 | 949 |
HV_KVM_MACHINE_VERSION = "machine_version" |
| 950 | 950 |
HV_KVM_PATH = "kvm_path" |
| 951 | 951 |
HV_VIF_TYPE = "vif_type" |
| 952 |
HV_VNET_HDR = "vnet_hdr" |
|
| 952 | 953 |
|
| 953 | 954 |
|
| 954 | 955 |
HVS_PARAMETER_TYPES = {
|
| ... | ... | |
| 1019 | 1020 |
HV_KVM_EXTRA: VTYPE_STRING, |
| 1020 | 1021 |
HV_KVM_MACHINE_VERSION: VTYPE_STRING, |
| 1021 | 1022 |
HV_VIF_TYPE: VTYPE_STRING, |
| 1023 |
HV_VNET_HDR: VTYPE_BOOL, |
|
| 1022 | 1024 |
} |
| 1023 | 1025 |
|
| 1024 | 1026 |
HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys()) |
| ... | ... | |
| 2103 | 2105 |
HV_VGA: "", |
| 2104 | 2106 |
HV_KVM_EXTRA: "", |
| 2105 | 2107 |
HV_KVM_MACHINE_VERSION: "", |
| 2108 |
HV_VNET_HDR: True, |
|
| 2106 | 2109 |
}, |
| 2107 | 2110 |
HT_FAKE: {},
|
| 2108 | 2111 |
HT_CHROOT: {
|
| b/lib/hypervisor/hv_kvm.py | ||
|---|---|---|
| 533 | 533 |
constants.HV_VGA: hv_base.NO_CHECK, |
| 534 | 534 |
constants.HV_KVM_EXTRA: hv_base.NO_CHECK, |
| 535 | 535 |
constants.HV_KVM_MACHINE_VERSION: hv_base.NO_CHECK, |
| 536 |
constants.HV_VNET_HDR: hv_base.NO_CHECK, |
|
| 536 | 537 |
} |
| 537 | 538 |
|
| 538 | 539 |
_VIRTIO = "virtio" |
| ... | ... | |
| 1520 | 1521 |
devlist = self._GetKVMOutput(kvm_path, self._KVMOPT_DEVICELIST) |
| 1521 | 1522 |
if self._NEW_VIRTIO_RE.search(devlist): |
| 1522 | 1523 |
nic_model = self._VIRTIO_NET_PCI |
| 1523 |
vnet_hdr = True
|
|
| 1524 |
vnet_hdr = up_hvp[constants.HV_VNET_HDR]
|
|
| 1524 | 1525 |
except errors.HypervisorError, _: |
| 1525 | 1526 |
# Older versions of kvm don't support DEVICE_LIST, but they don't |
| 1526 | 1527 |
# have new virtio syntax either. |
Also available in: Unified diff