From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDbZb-0006av-Eu for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDbZW-0003Pr-CY for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:15 -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 1TDbZW-0003NT-9B for qemu-devel@nongnu.org; Mon, 17 Sep 2012 09:41:10 -0400 From: Don Slutz Date: Mon, 17 Sep 2012 09:39:44 -0400 Message-ID: <1347889189-9199-21-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 12/17] target-i386: Add some known names to Hypervisor vendor. 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/cpu.c | 36 +++++++++++++++++++++++++++++++++++- target-i386/cpu.h | 12 ++++++++++++ 2 files changed, 47 insertions(+), 1 deletions(-) diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 1b3a472..9ac3076 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1206,6 +1206,20 @@ static char *x86_cpuid_get_hv_vendor(Object *obj, Error **errp) } value[CPUID_VENDOR_SZ] = '\0'; + /* Convert known names */ + if (!strcmp(value, CPUID_HV_VENDOR_VMWARE)) { + if (env->cpuid_hv_level == CPUID_HV_LEVEL_VMARE_4) { + pstrcpy(value, sizeof(value), "vmware4"); + } else if (env->cpuid_hv_level == CPUID_HV_LEVEL_VMARE_3) { + pstrcpy(value, sizeof(value), "vmware3"); + } + } 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"); + } return value; } @@ -1219,7 +1233,27 @@ static void x86_cpuid_set_hv_vendor(Object *obj, const char *value, memset(adj_value, 0, sizeof(adj_value)); - pstrcpy(adj_value, sizeof(adj_value), value); + /* Convert known names */ + if (!strcmp(value, "vmware") || !strcmp(value, "vmware4")) { + if (env->cpuid_hv_level == 0) { + env->cpuid_hv_level = CPUID_HV_LEVEL_VMARE_4; + } + pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_VMWARE); + } else if (!strcmp(value, "vmware3")) { + if (env->cpuid_hv_level == 0) { + env->cpuid_hv_level = CPUID_HV_LEVEL_VMARE_3; + } + pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_VMWARE); + } else if (!strcmp(value, "xen")) { + if (env->cpuid_hv_level == 0) { + env->cpuid_hv_level = CPUID_HV_LEVEL_XEN; + } + pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_XEN); + } else if (!strcmp(value, "kvm")) { + pstrcpy(adj_value, sizeof(adj_value), CPUID_HV_VENDOR_KVM); + } else { + pstrcpy(adj_value, sizeof(adj_value), value); + } env->cpuid_hv_vendor1 = 0; env->cpuid_hv_vendor2 = 0; diff --git a/target-i386/cpu.h b/target-i386/cpu.h index 53ba4cf..47bc00c 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -488,6 +488,18 @@ #define CPUID_VENDOR_VIA "CentaurHauls" +#define CPUID_HV_VENDOR_VMWARE_1 0x61774d56 /* "VMwa" */ +#define CPUID_HV_VENDOR_VMWARE_2 0x4d566572 /* "reVM" */ +#define CPUID_HV_VENDOR_VMWARE_3 0x65726177 /* "ware" */ +#define CPUID_HV_VENDOR_VMWARE "VMwareVMware" +#define CPUID_HV_LEVEL_VMARE_3 0x40000002 +#define CPUID_HV_LEVEL_VMARE_4 0x40000010 + +#define CPUID_HV_VENDOR_XEN "XenVMMXenVMM" +#define CPUID_HV_LEVEL_XEN 0x40000002 + +#define CPUID_HV_VENDOR_KVM "KVMKVMKVM" + #define CPUID_MWAIT_IBE (1 << 1) /* Interrupts can exit capability */ #define CPUID_MWAIT_EMX (1 << 0) /* enumeration supported */ -- 1.7.1