From owner-svn-src-projects@FreeBSD.ORG  Wed Dec 31 06:54:30 2014
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70ABE2AB;
 Wed, 31 Dec 2014 06:54:30 +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 5D46F36C9;
 Wed, 31 Dec 2014 06:54:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBV6sU8V060466;
 Wed, 31 Dec 2014 06:54:30 GMT (envelope-from bryanv@FreeBSD.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBV6sTlj060464;
 Wed, 31 Dec 2014 06:54:29 GMT (envelope-from bryanv@FreeBSD.org)
Message-Id: <201412310654.sBV6sTlj060464@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bryanv set sender to
 bryanv@FreeBSD.org using -f
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Wed, 31 Dec 2014 06:54:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r276453 - 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 &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects/>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Dec 2014 06:54:30 -0000

Author: bryanv
Date: Wed Dec 31 06:54:28 2014
New Revision: 276453
URL: https://svnweb.freebsd.org/changeset/base/276453

Log:
  Various cleanup

Modified:
  projects/paravirt/sys/x86/include/hypervisor.h
  projects/paravirt/sys/x86/x86/hypervisor.c

Modified: projects/paravirt/sys/x86/include/hypervisor.h
==============================================================================
--- projects/paravirt/sys/x86/include/hypervisor.h	Wed Dec 31 06:53:46 2014	(r276452)
+++ projects/paravirt/sys/x86/include/hypervisor.h	Wed Dec 31 06:54:28 2014	(r276453)
@@ -44,4 +44,3 @@ int	hypervisor_cpuid_base(const char *si
 void	hypervisor_print_info(void);
 
 #endif /* !_X86_HYPERVISOR_H_ */
-

Modified: projects/paravirt/sys/x86/x86/hypervisor.c
==============================================================================
--- projects/paravirt/sys/x86/x86/hypervisor.c	Wed Dec 31 06:53:46 2014	(r276452)
+++ projects/paravirt/sys/x86/x86/hypervisor.c	Wed Dec 31 06:54:28 2014	(r276453)
@@ -28,8 +28,6 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/limits.h>
-#include <sys/kernel.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 
@@ -37,8 +35,6 @@ __FBSDID("$FreeBSD$");
 #include <machine/cpu.h>
 
 #include <x86/hypervisor.h>
-#include <x86/kvm.h>
-#include <x86/vmware.h>
 
 char hv_vendor[16];
 SYSCTL_STRING(_hw, OID_AUTO, hv_vendor, CTLFLAG_RD, hv_vendor, 0,
@@ -88,13 +84,15 @@ hypervisor_cpuid_identify(void)
 
 		if (hvi->hvi_identify() != 0) {
 			hv_info = hvi;
-			vm_guest = hvi->hvi_type;
-			strncpy(hv_vendor, hvi->hvi_name, sizeof(hv_vendor));
-			return;
+			break;
 		}
 	}
 
-	vm_guest = VM_GUEST_VM;
+	if (hv_info != NULL) {
+		vm_guest = hvi->hvi_type;
+		strlcpy(hv_vendor, hvi->hvi_name, sizeof(hv_vendor));
+	} else
+		vm_guest = VM_GUEST_VM;
 }
 
 void