Re: CVS commit: src

[Paul Goyette <paul%whooppee.com@localhost>]

On Sat, 4 Jul 2020, Chuck Silvers wrote:

> Hi Paul,
>
> it's not clear to me why you were trying to do the thing that
> you were having trouble with in that PR...  there shouldn't
> have been any need to include any xen headers or have any
> xen-conditional code in a module in the first place.
>
> x86/cpu_ucode.c provides the same set of functions for both XEN and native
> kernels, so it would be fine to call those functions from a compat module.
> and it looks like x86/compat_60_cpu_ucode.c already does that.

Yeah, but the code #include'd some md headers that ended up being
xen headers, which brought in other xen stuff, which resulted in
some stuff being in the wrong order to get good values.

I'm pretty sure that I managed to exclude compat_60_cpu_ucode.c from
the compat_60 module to avoid this - the .if at the bottom was to
include compat_60_cpu_ucode.cONLY for i386 or amd64 but NOT xen.

With your recent commits I'll see if it works now.



> -Chuck
>
>
> On Sat, Jul 04, 2020 at 04:11:14PM -0700, Paul Goyette wrote:
> > Chuck,
> >
> > Does this mean that PR port-xen/53130 is no longer relevant?  And I
> > can now include microcode-loader compat code in the appropriate
> > compat_xx module?
> >
> > :)
> >
> >
> > On Sat, 4 Jul 2020, Chuck Silvers wrote:
> >
> > > Module Name:	src
> > > Committed By:	chs
> > > Date:		Sat Jul  4 21:02:16 UTC 2020
> > >
> > > Modified Files:
> > > 	src/distrib/sets/lists/modules: md.amd64 md.i386
> > > 	src/share/mk: bsd.own.mk
> > > 	src/sys/arch/x86/x86: x86_machdep.c
> > > 	src/sys/modules/arch: archdirs.mk
> > > Removed Files:
> > > 	src/sys/modules/arch/x86/amd64-xen: Makefile bsd.amd64-xen.mk
> > > 	src/sys/modules/arch/x86/i386pae-xen: Makefile bsd.i386pae-xen.mk
> > >
> > > Log Message:
> > > 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.
> > >
> > >
> > > To generate a diff of this commit:
> > > cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/modules/md.amd64 \
> > >    src/distrib/sets/lists/modules/md.i386
> > > cvs rdiff -u -r1.1199 -r1.1200 src/share/mk/bsd.own.mk
> > > cvs rdiff -u -r1.143 -r1.144 src/sys/arch/x86/x86/x86_machdep.c
> > > cvs rdiff -u -r1.5 -r1.6 src/sys/modules/arch/archdirs.mk
> > > cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/amd64-xen/Makefile
> > > cvs rdiff -u -r1.2 -r0 src/sys/modules/arch/x86/amd64-xen/bsd.amd64-xen.mk
> > > cvs rdiff -u -r1.1 -r0 src/sys/modules/arch/x86/i386pae-xen/Makefile
> > > cvs rdiff -u -r1.2 -r0 \
> > >    src/sys/modules/arch/x86/i386pae-xen/bsd.i386pae-xen.mk
> > >
> > > Please note that diffs are not public domain; they are subject to the
> > > copyright notices on the relevant files.
> >
> > +--------------------+--------------------------+-----------------------+
> > | Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
> > | (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
> > | Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
> > +--------------------+--------------------------+-----------------------+
>
> !DSPAM:5f0129f9286362089320970!

+--------------------+--------------------------+-----------------------+
| Paul Goyette       | PGP Key fingerprint:     | E-mail addresses:     |
| (Retired)          | FA29 0E3B 35AF E8AE 6651 | paul%whooppee.com@localhost     |
| Software Developer | 0786 F758 55DE 53BA 7731 | pgoyette%netbsd.org@localhost   |
+--------------------+--------------------------+-----------------------+