From patchwork Sat Sep 22 00:13:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 185991 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 0AFE82C007D for ; Sat, 22 Sep 2012 10:15:24 +1000 (EST) Received: from localhost ([::1]:59050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDNR-0001YM-VD for incoming@patchwork.ozlabs.org; Fri, 21 Sep 2012 20:15:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47695) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDMY-0008KP-P3 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TFDMX-0007u1-Px for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:26 -0400 Received: from hub021-nj-7.exch021.serverdata.net ([206.225.164.223]:13428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TFDMX-0007tw-M9 for qemu-devel@nongnu.org; Fri, 21 Sep 2012 20:14:25 -0400 Received: from localhost.localdomain (131.239.15.22) by east.exch021.serverdata.net (10.240.4.115) with Microsoft SMTP Server (TLS) id 14.2.309.2; Fri, 21 Sep 2012 17:14:25 -0700 From: Don Slutz To: , , , , , , , , Date: Fri, 21 Sep 2012 20:13:16 -0400 Message-ID: <1348272809-27742-5-git-send-email-Don@CloudSwitch.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348272809-27742-1-git-send-email-Don@CloudSwitch.com> References: <1348272809-27742-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.223 Cc: Don Slutz Subject: [Qemu-devel] [PATCH v5 04/17] target-i386: Add cpu object access routines for Hypervisor level. 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 These are modeled after x86_cpuid_get_xlevel and x86_cpuid_set_xlevel. Signed-off-by: Don Slutz --- target-i386/cpu.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 25ca986..7b31de9 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1166,6 +1166,32 @@ static void x86_cpuid_set_tsc_freq(Object *obj, Visitor *v, void *opaque, cpu->env.tsc_khz = value / 1000; } +static void x86_cpuid_get_hv_level(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + + visit_type_uint32(v, &cpu->env.cpuid_hv_level, name, errp); +} + +static void x86_cpuid_set_hv_level(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + X86CPU *cpu = X86_CPU(obj); + uint32_t value; + + visit_type_uint32(v, &value, name, errp); + if (error_is_set(errp)) { + return; + } + + if ((value != 0) && (value < 0x40000000)) { + value += 0x40000000; + } + cpu->env.cpuid_hv_level = value; + cpu->env.cpuid_hv_level_set = true; +} + #if !defined(CONFIG_USER_ONLY) static void x86_get_hv_spinlocks(Object *obj, Visitor *v, void *opaque, const char *name, Error **errp) @@ -2061,6 +2087,9 @@ static void x86_cpu_initfn(Object *obj) object_property_add(obj, "enforce", "bool", x86_cpuid_get_enforce, x86_cpuid_set_enforce, NULL, NULL, NULL); + object_property_add(obj, "hypervisor-level", "int", + x86_cpuid_get_hv_level, + x86_cpuid_set_hv_level, NULL, NULL, NULL); #if !defined(CONFIG_USER_ONLY) object_property_add(obj, "hv_spinlocks", "int", x86_get_hv_spinlocks,