[src/trunk]: src the x86 xen and non-xen modules are identical,

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src the x86 xen and non-xen modules are identical,
From: chs <chs%NetBSD.org@localhost>
Date: Sat, 01 May 2021 04:28:25 +0000

details:   https://anonhg.NetBSD.org/src/rev/372d22b3e72b
branches:  trunk
changeset: 973584:372d22b3e72b
user:      chs <chs%NetBSD.org@localhost>
date:      Sat Jul 04 21:02:15 2020 +0000

description:
the x86 xen and non-xen modules are identical,
so remove the unneeded extra copies.
Xen kernels now use the same modules as native kernels.

diffstat:

 distrib/sets/lists/modules/md.amd64                 |   5 +----
 distrib/sets/lists/modules/md.i386                  |   5 +----
 share/mk/bsd.own.mk                                 |   5 ++---
 sys/arch/x86/x86/x86_machdep.c                      |  17 ++---------------
 sys/modules/arch/archdirs.mk                        |  10 +---------
 sys/modules/arch/x86/amd64-xen/Makefile             |   5 -----
 sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk     |  12 ------------
 sys/modules/arch/x86/i386pae-xen/Makefile           |   5 -----
 sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk |  13 -------------
 9 files changed, 7 insertions(+), 70 deletions(-)

diffs (160 lines):

diff -r e5b4d4c56159 -r 372d22b3e72b distrib/sets/lists/modules/md.amd64
--- a/distrib/sets/lists/modules/md.amd64       Sat Jul 04 19:25:24 2020 +0000
+++ b/distrib/sets/lists/modules/md.amd64       Sat Jul 04 21:02:15 2020 +0000
@@ -1,7 +1,4 @@
-# $NetBSD: md.amd64,v 1.86 2020/03/12 15:04:13 pgoyette Exp $
-#
-# NOTE that there are two sets of files here:
-# @MODULEDIR@ and amd64-xen
+# $NetBSD: md.amd64,v 1.87 2020/07/04 21:02:16 chs Exp $
 #
 ./@MODULEDIR@/acpiacad                         modules-base-kernel     kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod           modules-base-kernel     kmod
diff -r e5b4d4c56159 -r 372d22b3e72b distrib/sets/lists/modules/md.i386
--- a/distrib/sets/lists/modules/md.i386        Sat Jul 04 19:25:24 2020 +0000
+++ b/distrib/sets/lists/modules/md.i386        Sat Jul 04 21:02:15 2020 +0000
@@ -1,8 +1,5 @@
-# $NetBSD: md.i386,v 1.86 2020/02/29 18:46:12 skrll Exp $
+# $NetBSD: md.i386,v 1.87 2020/07/04 21:02:16 chs Exp $
 #
-# NOTE that there are two sets of files here: @MODULEDIR@ and i386pae-xen
-#
-
 ./@MODULEDIR@/acpiacad                         modules-base-kernel     kmod
 ./@MODULEDIR@/acpiacad/acpiacad.kmod           modules-base-kernel     kmod
 ./@MODULEDIR@/acpibat                          modules-base-kernel     kmod
diff -r e5b4d4c56159 -r 372d22b3e72b share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Sat Jul 04 19:25:24 2020 +0000
+++ b/share/mk/bsd.own.mk       Sat Jul 04 21:02:15 2020 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.1199 2020/06/06 22:06:42 joerg Exp $
+#      $NetBSD: bsd.own.mk,v 1.1200 2020/07/04 21:02:16 chs Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1006,8 +1006,7 @@
 MKCOMPATX11:=  no
 .endif
 
-.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386" \
-    || ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
+.if ${MACHINE_ARCH} == "mips64eb" || ${MACHINE_ARCH} == "mips64el" \
     || (${MACHINE} == "evbppc" && ${MACHINE_ARCH} == "powerpc")
 MKCOMPATMODULES?=      yes
 .else
diff -r e5b4d4c56159 -r 372d22b3e72b sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Sat Jul 04 19:25:24 2020 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Sat Jul 04 21:02:15 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $     */
+/*     $NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $    */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.143 2020/05/21 21:12:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.144 2020/07/04 21:02:16 chs Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -100,10 +100,6 @@
 #include <xen/xen.h>
 #include <xen/hypervisor.h>
 #endif
-#ifdef XENPV
-char module_machine_amd64_xen[] = "amd64-xen";
-char module_machine_i386pae_xen[] = "i386pae-xen";
-#endif
 
 #ifndef XENPV
 void (*delay_func)(unsigned int) = i8254_delay;
@@ -224,15 +220,6 @@
        struct btinfo_modulelist *biml;
        struct bi_modulelist_entry *bi, *bimax;
 
-       /* setup module path for XEN kernels */
-#ifdef XENPV
-#ifdef __x86_64__
-       module_machine = module_machine_amd64_xen;
-#else
-       module_machine = module_machine_i386pae_xen;
-#endif
-#endif
-
        biml = lookup_bootinfo(BTINFO_MODULELIST);
        if (biml == NULL) {
                aprint_debug("No module info at boot\n");
diff -r e5b4d4c56159 -r 372d22b3e72b sys/modules/arch/archdirs.mk
--- a/sys/modules/arch/archdirs.mk      Sat Jul 04 19:25:24 2020 +0000
+++ b/sys/modules/arch/archdirs.mk      Sat Jul 04 21:02:15 2020 +0000
@@ -1,15 +1,7 @@
-#      $NetBSD: archdirs.mk,v 1.5 2020/06/27 06:50:00 rin Exp $
+#      $NetBSD: archdirs.mk,v 1.6 2020/07/04 21:02:16 chs Exp $
 
 # list of subdirs used per-platform
 
-.if ${MACHINE} == "amd64"
-ARCHDIR_SUBDIR=        x86/amd64-xen
-.endif
-
-.if ${MACHINE} == "i386"
-ARCHDIR_SUBDIR=        x86/i386pae-xen
-.endif
-
 .if ${MACHINE_ARCH} == "powerpc"
 ARCHDIR_SUBDIR=        powerpc/powerpc-ibm4xx powerpc/powerpc-booke
 .endif
diff -r e5b4d4c56159 -r 372d22b3e72b sys/modules/arch/x86/amd64-xen/Makefile
--- a/sys/modules/arch/x86/amd64-xen/Makefile   Sat Jul 04 19:25:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2014/08/11 03:43:25 jnemeth Exp $
-
-BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.amd64-xen.mk
-
-.include "../../compatsubdir.mk"
diff -r e5b4d4c56159 -r 372d22b3e72b sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
--- a/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk   Sat Jul 04 19:25:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-#      $NetBSD: bsd.amd64-xen.mk,v 1.2 2019/01/27 02:08:43 pgoyette Exp $
-
-.ifndef _BSD_AMD64_XEN_MK_
-_BSD_AMD64_XEN_MK_=1
-
-KMODULEARCHDIR:=       amd64-xen
-
-XEN=   1
-
-#CPPFLAGS+=    -DXEN
-
-.endif # _BSD_AMD64_XEN_MK_
diff -r e5b4d4c56159 -r 372d22b3e72b sys/modules/arch/x86/i386pae-xen/Makefile
--- a/sys/modules/arch/x86/i386pae-xen/Makefile Sat Jul 04 19:25:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2014/08/11 03:43:26 jnemeth Exp $
-
-BSD_MK_COMPAT_FILE=${.CURDIR}/bsd.i386pae-xen.mk
-
-.include "../../compatsubdir.mk"
diff -r e5b4d4c56159 -r 372d22b3e72b sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
--- a/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk       Sat Jul 04 19:25:24 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-#      $NetBSD: bsd.i386pae-xen.mk,v 1.2 2019/01/27 02:08:44 pgoyette Exp $
-
-.ifndef _BSD_I386PAE_XEN_MK_
-_BSD_I386PAE_XEN_MK_=1
-
-KMODULEARCHDIR:=       i386pae-xen
-
-XEN=   1
-PAE=   1
-
-#CPPFLAGS+=    -DPAE -DXEN
-
-.endif # _BSD_I386PAE_XEN_MK_

Prev by Date: [src/trunk]: src/doc note x86 Xen kernel module change.
Next by Date: [src/trunk]: src/usr.bin/make/unit-tests make(1): improve documentation about...
Previous by Thread: [src/trunk]: src/doc note x86 Xen kernel module change.
Next by Thread: [src/trunk]: src/usr.bin/make/unit-tests make(1): improve documentation about...
Indexes:

Home | Main Index | Thread Index | Old Index