Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/cpuctl/arch Add HAXM.



details:   https://anonhg.NetBSD.org/src/rev/8963e6a4e9f5
branches:  trunk
changeset: 449796:8963e6a4e9f5
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Mar 24 04:43:54 2019 +0000

description:
Add HAXM.

diffstat:

 usr.sbin/cpuctl/arch/i386.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r dd2d99162a31 -r 8963e6a4e9f5 usr.sbin/cpuctl/arch/i386.c
--- a/usr.sbin/cpuctl/arch/i386.c       Sun Mar 24 01:16:43 2019 +0000
+++ b/usr.sbin/cpuctl/arch/i386.c       Sun Mar 24 04:43:54 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i386.c,v 1.94 2019/03/22 04:39:02 msaitoh Exp $        */
+/*     $NetBSD: i386.c,v 1.95 2019/03/24 04:43:54 msaitoh Exp $        */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: i386.c,v 1.94 2019/03/22 04:39:02 msaitoh Exp $");
+__RCSID("$NetBSD: i386.c,v 1.95 2019/03/24 04:43:54 msaitoh Exp $");
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -1716,6 +1716,7 @@
                /*
                 * HV vendor    ID string
                 * ------------+--------------
+                * HAXM         "HAXMHAXMHAXM"
                 * KVM          "KVMKVMKVM"
                 * Microsoft    "Microsoft Hv"
                 * QEMU(TCG)    "TCGTCGTCGTCG"
@@ -1723,7 +1724,9 @@
                 * Xen          "XenVMMXenVMM"
                 * NetBSD       "___ NVMM ___"
                 */
-               if (strncmp(hv_sig, "KVMKVMKVM", 9) == 0)
+               if (strncmp(hv_sig, "HAXMHAXMHAXM", 12) == 0)
+                       hv_name = "HAXM";
+               else if (strncmp(hv_sig, "KVMKVMKVM", 9) == 0)
                        hv_name = "KVM";
                else if (strncmp(hv_sig, "Microsoft Hv", 12) == 0)
                        hv_name = "Hyper-V";



Home | Main Index | Thread Index | Old Index