From 69161658b1c504064ce50f7f89662b44c39d8839 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Mon, 3 Mar 2014 12:09:19 +0100 Subject: [PATCH 07/12] target-i386: Convert 'hv_relaxed' to static property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RH-Author: Vadim Rozenfeld Message-id: <1393848564-10511-8-git-send-email-vrozenfe@redhat.com> Patchwork-id: 57963 O-Subject: [RHEL-7.0 qemu-kvm v4 PATCH 07/12] target-i386: Convert 'hv_relaxed' to static property Bugzilla: 1057173 RH-Acked-by: Paolo Bonzini RH-Acked-by: Igor Mammedov RH-Acked-by: Eduardo Habkost RH-Acked-by: Juan Quintela From: Igor Mammedov Signed-off-by: Igor Mammedov Signed-off-by: Andreas Färber (cherry picked from commit 89314504197b305173e3f2d23ce541898ef2691c) Conflicts: target-i386/cpu.c --- target-i386/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Signed-off-by: Miroslav Rezanina --- target-i386/cpu.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 826d8d6..7c8efaf 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1649,7 +1649,7 @@ static void cpu_x86_parse_featurestr(X86CPU *cpu, char *features, Error **errp) } else if (!strcmp(featurestr, "enforce")) { check_cpuid = enforce_cpuid = 1; } else if (!strcmp(featurestr, "hv_relaxed")) { - cpu->hyperv_relaxed_timing = true; + object_property_parse(OBJECT(cpu), "on", "hv-relaxed", errp); } else if (!strcmp(featurestr, "hv_vapic")) { cpu->hyperv_vapic = true; } else { @@ -2588,6 +2588,7 @@ static int64_t x86_cpu_get_arch_id(CPUState *cs) static Property x86_cpu_properties[] = { DEFINE_PROP_BOOL("pmu", X86CPU, enable_pmu, false), + DEFINE_PROP_BOOL("hv-relaxed", X86CPU, hyperv_relaxed_timing, false), DEFINE_PROP_END_OF_LIST() }; -- 1.7.1