From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41103) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZa-0006aH-El for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDbZV-0003OX-76 for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:14 -0400 Received: from hub021-nj-2.exch021.serverdata.net ([206.225.164.217]:4188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZV-0003NT-2z for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:09 -0400 From: Don Slutz Date: Mon, 17 Sep 2012 09:39:34 -0400 Message-ID: <1347889189-9199-11-git-send-email-Don@CloudSwitch.com> In-Reply-To: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> References: <1346354435-21685-1-git-send-email-Don@CloudSwitch.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH v3 06/17] target-i386: Use Hypervisor level in -machine pc, accel=kvm. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mtosatti@redhat.com, ehabkost@redhat.com, imammedo@redhat.com, avi@redhat.com, afaerber@suse.de, peter.maydell@linaro.org, kvm@vger.kernel.org, anthony@codemonkey.ws Cc: Don Slutz Signed-off-by: Don Slutz --- target-i386/kvm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 895d848..bf27793 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -389,12 +389,12 @@ int kvm_arch_init_vcpu(CPUX86State *env) c = &cpuid_data.entries[cpuid_i++]; memset(c, 0, sizeof(*c)); c->function = KVM_CPUID_SIGNATURE; - if (!hyperv_enabled()) { + if (env->cpuid_hv_level == 0) { memcpy(signature, "KVMKVMKVM\0\0\0", 12); c->eax = 0; } else { memcpy(signature, "Microsoft Hv", 12); - c->eax = HYPERV_CPUID_MIN; + c->eax = env->cpuid_hv_level; } c->ebx = signature[0]; c->ecx = signature[1]; -- 1.7.1