From patchwork Thu Sep 20 20:03:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 185495 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6B3932C0079 for ; Fri, 21 Sep 2012 06:34:26 +1000 (EST) Received: from localhost ([::1]:39398 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEmzB-0001s1-TC for incoming@patchwork.ozlabs.org; Thu, 20 Sep 2012 16:04:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51660) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEmye-0000dV-Ap for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:04:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEmyd-0001Ve-5q for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:04:00 -0400 Received: from hub021-nj-8.exch021.serverdata.net ([206.225.164.233]:58286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEmyd-0001VU-2I for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:03:59 -0400 Received: from localhost.localdomain (131.239.15.22) by east.exch021.serverdata.net (10.240.4.118) with Microsoft SMTP Server (TLS) id 14.2.309.2; Thu, 20 Sep 2012 13:03:58 -0700 From: Don Slutz To: , , , , , , , , Date: Thu, 20 Sep 2012 16:03:20 -0400 Message-ID: <1348171412-23669-6-git-send-email-Don@CloudSwitch.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348171412-23669-1-git-send-email-Don@CloudSwitch.com> References: <1348171412-23669-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows XP/2000 (RFC1323+, w+, tstamp-) X-Received-From: 206.225.164.233 Cc: Don Slutz Subject: [Qemu-devel] [PATCH v4 05/17] target-i386: Add x86_set_hyperv. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is used to set the cpu object's hypervisor level to the default for Microsoft's Hypervisor. HYPERV_CPUID_MIN (0x40000005) is defined in a linux header file. CPUID_HV_LEVEL_HYPERV (0x40000005) is used instead. Signed-off-by: Don Slutz --- target-i386/cpu.c | 10 ++++++++++ target-i386/cpu.h | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 0e4a18d..6aeb194 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1192,6 +1192,13 @@ static void x86_cpuid_set_hv_level(Object *obj, Visitor *v, void *opaque, } #if !defined(CONFIG_USER_ONLY) +static void x86_set_hyperv(Object *obj, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + cpu->env.cpuid_hv_level = CPUID_HV_LEVEL_HYPERV; +} + static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) { @@ -1214,6 +1221,7 @@ static void x86_set_hv_spinlocks(Object *obj, Visitor *v, void *opaque, return; } hyperv_set_spinlock_retries(value); + x86_set_hyperv(obj, errp); } static void x86_get_hv_relaxed(Object *obj, Visitor *v, void *opaque, @@ -1234,6 +1242,7 @@ static void x86_set_hv_relaxed(Object *obj, Visitor *v, void *opaque, return; } hyperv_enable_relaxed_timing(value); + x86_set_hyperv(obj, errp); } static void x86_get_hv_vapic(Object *obj, Visitor *v, void *opaque, @@ -1254,6 +1263,7 @@ static void x86_set_hv_vapic(Object *obj, Visitor *v, void *opaque, return; } hyperv_enable_vapic_recommended(value); + x86_set_hyperv(obj, errp); } #endif diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 05c0848..7fc7906 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -488,6 +488,8 @@ #define CPUID_VENDOR_VIA "CentaurHauls" +#define CPUID_HV_LEVEL_HYPERV 0x40000005 + #define CPUID_MWAIT_IBE (1 << 1) /* Interrupts can exit capability */ #define CPUID_MWAIT_EMX (1 << 0) /* enumeration supported */