Re: [PATCH stable-2.8 1/2] Support 'viridian' parameter in Xen HVM

[Helga Velroyen]

LGTM, thanks


On Tue, Aug 6, 2013 at 10:28 AM, Thomas Thrainer <thoma...@google.com>wrote:

> This parameter is required to prevent bluescreens in Windows instances.
>
> This fixes issue 233.
>
> Signed-off-by: Heiko Baumann <hei...@googlemail.com>
> Signed-off-by: Thomas Thrainer <thoma...@google.com>
> ---
>  lib/constants.py         | 3 +++
>  lib/hypervisor/hv_xen.py | 6 ++++++
>  2 files changed, 9 insertions(+)
>
> diff --git a/lib/constants.py b/lib/constants.py
> index 339ead8..eefc250 100644
> --- a/lib/constants.py
> +++ b/lib/constants.py
> @@ -950,6 +950,7 @@ HV_KVM_MACHINE_VERSION = "machine_version"
>  HV_KVM_PATH = "kvm_path"
>  HV_VIF_TYPE = "vif_type"
>  HV_VNET_HDR = "vnet_hdr"
> +HV_VIRIDIAN = "viridian"
>
>
>  HVS_PARAMETER_TYPES = {
> @@ -1021,6 +1022,7 @@ HVS_PARAMETER_TYPES = {
>    HV_KVM_MACHINE_VERSION: VTYPE_STRING,
>    HV_VIF_TYPE: VTYPE_STRING,
>    HV_VNET_HDR: VTYPE_BOOL,
> +  HV_VIRIDIAN: VTYPE_BOOL,
>    }
>
>  HVS_PARAMETERS = frozenset(HVS_PARAMETER_TYPES.keys())
> @@ -2047,6 +2049,7 @@ HVC_DEFAULTS = {
>      HV_CPU_CAP: 0,
>      HV_CPU_WEIGHT: 256,
>      HV_VIF_TYPE: HT_HVM_VIF_IOEMU,
> +    HV_VIRIDIAN: False,
>      },
>    HT_KVM: {
>      HV_KVM_PATH: KVM_PATH,
> diff --git a/lib/hypervisor/hv_xen.py b/lib/hypervisor/hv_xen.py
> index daf0b3f..909ef5f 100644
> --- a/lib/hypervisor/hv_xen.py
> +++ b/lib/hypervisor/hv_xen.py
> @@ -926,6 +926,7 @@ class XenHvmHypervisor(XenHypervisor):
>        (False, lambda x: 0 < x < 65535, "invalid weight", None, None),
>      constants.HV_VIF_TYPE:
>        hv_base.ParamInSet(False, constants.HT_HVM_VALID_VIF_TYPES),
> +    constants.HV_VIRIDIAN: hv_base.NO_CHECK,
>      }
>
>    def _GetConfig(self, instance, startup_memory, block_devices):
> @@ -963,6 +964,11 @@ class XenHvmHypervisor(XenHypervisor):
>        config.write("acpi = 1\n")
>      else:
>        config.write("acpi = 0\n")
> +    if hvp[constants.HV_VIRIDIAN]:
> +      config.write("viridian = 1\n")
> +    else:
> +      config.write("viridian = 0\n")
> +
>      config.write("apic = 1\n")
>      config.write("device_model = '%s'\n" % hvp[constants.HV_DEVICE_MODEL])
>      config.write("boot = '%s'\n" % hvp[constants.HV_BOOT_ORDER])
> --
> 1.8.3
>
>