[src/bouyer-xenpvh]: src/sys/arch/x86/x86 Attach hypervisor earlier, so that ...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8bb9b93579ae
branches:  bouyer-xenpvh
changeset: 930675:8bb9b93579ae
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Apr 11 21:21:49 2020 +0000

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

diffstat:

 sys/arch/x86/x86/mainbus.c |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 61e0477ba905 -r 8bb9b93579ae sys/arch/x86/x86/mainbus.c
--- a/sys/arch/x86/x86/mainbus.c        Sat Apr 11 21:21:16 2020 +0000
+++ b/sys/arch/x86/x86/mainbus.c        Sat Apr 11 21:21:49 2020 +0000
@@ -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 @@
 #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