From owner-svn-src-projects@freebsd.org Fri Aug 26 03:46:44 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 66B00BC4B75 for ; Fri, 26 Aug 2016 03:46:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 367A017CA; Fri, 26 Aug 2016 03:46:44 +0000 (UTC) (envelope-from ngie@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7Q3khxZ006132; Fri, 26 Aug 2016 03:46:43 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7Q3khFE006131; Fri, 26 Aug 2016 03:46:43 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201608260346.u7Q3khFE006131@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Fri, 26 Aug 2016 03:46:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r304830 - projects/netbsd-tests-update-12/contrib/netbsd-tests/lib/libc/gen 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.22 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: Fri, 26 Aug 2016 03:46:44 -0000 Author: ngie Date: Fri Aug 26 03:46:43 2016 New Revision: 304830 URL: https://svnweb.freebsd.org/changeset/base/304830 Log: Detect virtual machines on FreeBSD using the kern.vm_guest sysctl kern.vm_guest == none -> not a virtual machine It's a bit of a misnomer with the function being named `isQEMU`... but FreeBSD's support seems to be a bit more all-encompassing than NetBSD's is today. Sponsored by: EMC / Isilon Storage Division Modified: projects/netbsd-tests-update-12/contrib/netbsd-tests/lib/libc/gen/isqemu.h Modified: projects/netbsd-tests-update-12/contrib/netbsd-tests/lib/libc/gen/isqemu.h ============================================================================== --- projects/netbsd-tests-update-12/contrib/netbsd-tests/lib/libc/gen/isqemu.h Fri Aug 26 03:36:37 2016 (r304829) +++ projects/netbsd-tests-update-12/contrib/netbsd-tests/lib/libc/gen/isqemu.h Fri Aug 26 03:46:43 2016 (r304830) @@ -41,6 +41,30 @@ static __inline bool isQEMU(void) { +#ifdef __FreeBSD__ + char *vm_guest_name_buf; + size_t len; + bool is_vm; + + if (sysctlbyname("kern.vm_guest", NULL, &len, NULL, 0) == -1) + err(EXIT_FAILURE, "sysctl"); + + if ((vm_guest_name_buf = malloc(len)) == NULL) + err(EXIT_FAILURE, "malloc"); + + if (sysctlbyname("kern.vm_guest", vm_guest_name_buf, &len, NULL, 0) + == -1) + err(EXIT_FAILURE, "sysctl"); + + if (strcmp(vm_guest_name_buf, "none") == 0) + is_vm = false; + else + is_vm = true; + + free(vm_guest_name_buf); + + return is_vm; +#else #if defined(__i386__) || defined(__x86_64__) char name[1024]; size_t len = sizeof(name); @@ -54,6 +78,7 @@ isQEMU(void) { #else return false; #endif +#endif } #ifdef TEST