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 <sys/cdefs.h>
-__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 <sys/param.h>
#include <sys/systm.h>
@@ -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
