From patchwork Thu Sep 20 20:06:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Don Slutz X-Patchwork-Id: 185475 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 2EE332C0078 for ; Fri, 21 Sep 2012 06:06:57 +1000 (EST) Received: from localhost ([::1]:42041 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEn1T-0003Rz-3m for incoming@patchwork.ozlabs.org; Thu, 20 Sep 2012 16:06:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEn1H-0003Lk-9d for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TEn1G-00031w-C5 for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:06:43 -0400 Received: from hub021-nj-8.exch021.serverdata.net ([206.225.164.233]:54950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TEn1G-00031s-8X for qemu-devel@nongnu.org; Thu, 20 Sep 2012 16:06:42 -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:06:42 -0700 From: Don Slutz To: , , , Date: Thu, 20 Sep 2012 16:06:27 -0400 Message-ID: <1348171587-23725-2-git-send-email-Don@CloudSwitch.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1348171587-23725-1-git-send-email-Don@CloudSwitch.com> References: <1348171587-23725-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 v2 1/1] target-i386: Fix default Hypervisor level for hypervisor-vendor=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 From http://lkml.indiana.edu/hypermail/linux/kernel/1205.0/00100.html EAX should be KVM_CPUID_FEATURES (0x40000001) not 0. Added hypervisor-vendor=kvm0 to get the older CPUID result. kvm1 selects the newer one. Signed-off-by: Don Slutz --- target-i386/cpu.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 72a8442..e51b2b1 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1250,9 +1250,12 @@ static char *x86_cpuid_get_hv_vendor(Object *obj, Error **errp) } else if (!strcmp(value, CPUID_HV_VENDOR_XEN) && env->cpuid_hv_level == CPUID_HV_LEVEL_XEN) { pstrcpy(value, sizeof(value), "xen"); - } else if (!strcmp(value, CPUID_HV_VENDOR_KVM) && - env->cpuid_hv_level == 0) { - pstrcpy(value, sizeof(value), "kvm"); + } else if (!strcmp(value, CPUID_HV_VENDOR_KVM)) { + if (env->cpuid_hv_level == CPUID_HV_LEVEL_KVM) { + pstrcpy(value, sizeof(value), "kvm1"); + } else if (env->cpuid_hv_level == 0) { + pstrcpy(value, sizeof(value), "kvm0"); + } } return value; } @@ -1288,7 +1291,13 @@ static void x86_cpuid_set_hv_vendor(Object *obj, const char *value, env->cpuid_hv_level = CPUID_HV_LEVEL_XEN; } pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_XEN); - } else if (!strcmp(value, "kvm")) { + } else if (!strcmp(value, "kvm") || !strcmp(value, "kvm1")) { + if (env->cpuid_hv_level == 0) { + env->cpuid_hv_level = CPUID_HV_LEVEL_KVM; + } + pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_KVM); + } else if (!strcmp(value, "kvm0")) { + env->cpuid_hv_level = 0; pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_KVM); } else { pstrcpy(adj_value, sizeof(adj_value), value);