From patchwork Mon Sep 17 13:39:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 184427 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 7B7A52C0084 for ; Tue, 18 Sep 2012 00:39:08 +1000 (EST) Received: from localhost ([::1]:51402 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbaO-0008QJ-4c for incoming@patchwork.ozlabs.org; Mon, 17 Sep 2012 09:42:04 -0400 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 Received: from localhost.localdomain (131.239.15.22) by east.exch021.serverdata.net (10.240.4.34) with Microsoft SMTP Server (TLS) id 14.2.309.2; Mon, 17 Sep 2012 06:40:43 -0700 From: Don Slutz To: , , , , , , , , Date: Mon, 17 Sep 2012 09:39:34 -0400 Message-ID: <1347889189-9199-11-git-send-email-Don@CloudSwitch.com> X-Mailer: git-send-email 1.7.1 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 X-detected-operating-system: by eggs.gnu.org: Windows 2000 SP2+, XP SP1+ (seldom 98) X-Received-From: 206.225.164.217 Cc: Don Slutz Subject: [Qemu-devel] [PATCH v3 06/17] target-i386: Use Hypervisor level in -machine pc, accel=kvm. 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 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];