From owner-svn-src-projects@FreeBSD.ORG Wed Dec 31 06:53:48 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 398C91B9; Wed, 31 Dec 2014 06:53:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0B7CE36C4; Wed, 31 Dec 2014 06:53:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBV6rleQ060334; Wed, 31 Dec 2014 06:53:47 GMT (envelope-from bryanv@FreeBSD.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBV6rlwU060329; Wed, 31 Dec 2014 06:53:47 GMT (envelope-from bryanv@FreeBSD.org) Message-Id: <201412310653.sBV6rlwU060329@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bryanv set sender to bryanv@FreeBSD.org using -f From: Bryan Venteicher Date: Wed, 31 Dec 2014 06:53:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r276452 - in projects/paravirt/sys/x86: include x86 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Dec 2014 06:53:48 -0000 Author: bryanv Date: Wed Dec 31 06:53:46 2014 New Revision: 276452 URL: https://svnweb.freebsd.org/changeset/base/276452 Log: Include the signature in the hypervisor info structure Modified: projects/paravirt/sys/x86/include/hypervisor.h projects/paravirt/sys/x86/x86/kvm.c projects/paravirt/sys/x86/x86/vmware.c Modified: projects/paravirt/sys/x86/include/hypervisor.h ============================================================================== --- projects/paravirt/sys/x86/include/hypervisor.h Wed Dec 31 06:50:44 2014 (r276451) +++ projects/paravirt/sys/x86/include/hypervisor.h Wed Dec 31 06:53:46 2014 (r276452) @@ -33,6 +33,7 @@ typedef int hypervisor_info_identify_t(v struct hypervisor_info { const char *hvi_name; + const char *hvi_signature; enum VM_GUEST hvi_type; hypervisor_info_identify_t *hvi_identify; }; Modified: projects/paravirt/sys/x86/x86/kvm.c ============================================================================== --- projects/paravirt/sys/x86/x86/kvm.c Wed Dec 31 06:50:44 2014 (r276451) +++ projects/paravirt/sys/x86/x86/kvm.c Wed Dec 31 06:53:46 2014 (r276452) @@ -38,6 +38,7 @@ static uint32_t kvm_cpuid_identify(void const struct hypervisor_info kvm_hypervisor_info = { .hvi_name = "KVM", + .hvi_signature = "KVMKVMKVM\0\0", .hvi_type = VM_GUEST_KVM, .hvi_identify = kvm_identify, }; @@ -50,8 +51,8 @@ kvm_cpuid_identify(void) { if (kvm_cpuid_base == -1) { - hypervisor_cpuid_base("KVMKVMKVM\0\0", 0, &kvm_cpuid_base, - &kvm_cpuid_high); + hypervisor_cpuid_base(kvm_hypervisor_info.hvi_signature, + 0, &kvm_cpuid_base, &kvm_cpuid_high); } return (kvm_cpuid_base); Modified: projects/paravirt/sys/x86/x86/vmware.c ============================================================================== --- projects/paravirt/sys/x86/x86/vmware.c Wed Dec 31 06:50:44 2014 (r276451) +++ projects/paravirt/sys/x86/x86/vmware.c Wed Dec 31 06:53:46 2014 (r276452) @@ -39,6 +39,7 @@ static uint32_t vmware_cpuid_identify(v const struct hypervisor_info vmware_hypervisor_info = { .hvi_name = "VMware", + .hvi_signature = "VMwareVMware", .hvi_type = VM_GUEST_VMWARE, .hvi_identify = vmware_identify, }; @@ -51,8 +52,8 @@ vmware_cpuid_identify(void) { if (vmware_cpuid_base == -1) { - hypervisor_cpuid_base("VMwareVMware", 0, &vmware_cpuid_base, - &vmware_cpuid_high); + hypervisor_cpuid_base(vmware_hypervisor_info.hvi_signature, + 0, &vmware_cpuid_base, &vmware_cpuid_high); } return (vmware_cpuid_base);