CVS commit: [bouyer-xenpvh] src/sys/arch/x86/x86

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Apr 11 21:21:49 UTC 2020

Modified Files:
src/sys/arch/x86/x86 [bouyer-xenpvh]: mainbus.c

Log Message:
Attach hypervisor earlier, so that ISA/PCI emulated device are disabled
before we probe them.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.12.1 src/sys/arch/x86/x86/mainbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/mainbus.c
diff -u src/sys/arch/x86/x86/mainbus.c:1.3 src/sys/arch/x86/x86/mainbus.c:1.3.12.1
--- src/sys/arch/x86/x86/mainbus.c:1.3	Thu Feb 14 08:18:25 2019
+++ src/sys/arch/x86/x86/mainbus.c	Sat Apr 11 21:21:49 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.3 2019/02/14 08:18:25 cherry Exp $ */
+/* $NetBSD: mainbus.c,v 1.3.12.1 2020/04/11 21:21:49 bouyer Exp $ */
 
 /*
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3 2019/02/14 08:18:25 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.3.12.1 2020/04/11 21:21:49 bouyer Exp $");
 
 #include 
 #include 
@@ -225,17 +225,17 @@ mainbus_attach(device_t parent, device_t
 #endif /* XENPV */
 		x86_cpubus_attach(self);
 
-#if defined(__i386__) && !defined(XENPV)
-		i386_mainbus_attach(parent, self, aux);
-#elif defined(__x86_64__) && !defined(XENPV)
-		amd64_mainbus_attach(parent, self, aux);
-#endif
 #if defined(XENPV)
 	}
 #endif /* XENPV */
 #if defined(XEN)
 	xen_mainbus_attach(parent, self, aux);
 #endif
+#if defined(__i386__) && !defined(XENPV)
+	i386_mainbus_attach(parent, self, aux);
+#elif defined(__x86_64__) && !defined(XENPV)
+	amd64_mainbus_attach(parent, self, aux);
+#endif
 }
 
 int

CVS commit: [bouyer-xenpvh] src/sys/arch/x86/x86

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Sat Apr 11 08:06:16 UTC 2020

Modified Files:
src/sys/arch/x86/x86 [bouyer-xenpvh]: x86_machdep.c

Log Message:
Remove spaces in machdep.hypervisor, suggested by mlelstv@


To generate a diff of this commit:
cvs rdiff -u -r1.137.2.1 -r1.137.2.2 src/sys/arch/x86/x86/x86_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.137.2.1 src/sys/arch/x86/x86/x86_machdep.c:1.137.2.2
--- src/sys/arch/x86/x86/x86_machdep.c:1.137.2.1	Wed Apr  8 17:59:16 2020
+++ src/sys/arch/x86/x86/x86_machdep.c	Sat Apr 11 08:06:16 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: x86_machdep.c,v 1.137.2.1 2020/04/08 17:59:16 bouyer Exp $	*/
+/*	$NetBSD: x86_machdep.c,v 1.137.2.2 2020/04/11 08:06:16 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.137.2.1 2020/04/08 17:59:16 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.137.2.2 2020/04/11 08:06:16 bouyer Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -1255,10 +1255,10 @@ sysctl_machdep_tsc_enable(SYSCTLFN_ARGS)
 static const char * const vm_guest_name[VM_LAST] = {
 	[VM_GUEST_NO] =		"none",
 	[VM_GUEST_VM] =		"generic",
-	[VM_GUEST_XENPV] =	"Xen PV",
-	[VM_GUEST_XENPVH] =	"Xen PVH",
-	[VM_GUEST_XENHVM] =	"Xen HVM",
-	[VM_GUEST_XENPVHVM] =	"Xen PVHVM",
+	[VM_GUEST_XENPV] =	"XenPV",
+	[VM_GUEST_XENPVH] =	"XenPVH",
+	[VM_GUEST_XENHVM] =	"XenHVM",
+	[VM_GUEST_XENPVHVM] =	"XenPVHVM",
 	[VM_GUEST_HV] =		"Hyper-V",
 	[VM_GUEST_VMWARE] =	"VMware",
 	[VM_GUEST_KVM] =	"KVM",