| Message ID | 20241005151548.29184-3-jgross@suse.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | stubdom: prepare more fine grained Xen library usage | expand |
> diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg > index 8df49092cd..5145b357e0 100644 > --- a/stubdom/grub/minios.cfg > +++ b/stubdom/grub/minios.cfg > @@ -1,3 +1,4 @@ > -CONFIG_START_NETWORK=n > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_SPARSE_BSS=n > CONFIG_TPMFRONT=y Grub does use LWIP, and just does not want mini-os to start network automatically, grub does so by itself from minios_probe. > diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg > index 31652ee4f2..22f66f1351 100644 > --- a/stubdom/vtpm/minios.cfg > +++ b/stubdom/vtpm/minios.cfg > @@ -1,7 +1,8 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_TPMFRONT=y > CONFIG_TPM_TIS=n > CONFIG_TPMBACK=y > -CONFIG_START_NETWORK=n > CONFIG_TEST=n > CONFIG_PCIFRONT=n > CONFIG_BLKFRONT=y > diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg > index 3fb383d30f..a9f13a2fd2 100644 > --- a/stubdom/vtpmmgr/minios.cfg > +++ b/stubdom/vtpmmgr/minios.cfg > @@ -1,7 +1,8 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_TPMFRONT=y > CONFIG_TPM_TIS=y > CONFIG_TPMBACK=y > -CONFIG_START_NETWORK=n > CONFIG_TEST=n > CONFIG_PCIFRONT=n > CONFIG_BLKFRONT=y I guess vtpm indeed don't need lwip. Samuel
On 07.10.24 23:50, Samuel Thibault wrote: >> diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg >> index 8df49092cd..5145b357e0 100644 >> --- a/stubdom/grub/minios.cfg >> +++ b/stubdom/grub/minios.cfg >> @@ -1,3 +1,4 @@ >> -CONFIG_START_NETWORK=n >> +CONFIG_LIBC=y >> +CONFIG_LWIP=n >> CONFIG_SPARSE_BSS=n >> CONFIG_TPMFRONT=y > > Grub does use LWIP, and just does not want mini-os to start network > automatically, grub does so by itself from minios_probe. Are you sure? LWIPDIR isn't being set for building grub-stubdom. How does this work? Juergen
Jürgen Groß, le mar. 08 oct. 2024 11:18:26 +0200, a ecrit: > On 07.10.24 23:50, Samuel Thibault wrote: > > > diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg > > > index 8df49092cd..5145b357e0 100644 > > > --- a/stubdom/grub/minios.cfg > > > +++ b/stubdom/grub/minios.cfg > > > @@ -1,3 +1,4 @@ > > > -CONFIG_START_NETWORK=n > > > +CONFIG_LIBC=y > > > +CONFIG_LWIP=n > > > CONFIG_SPARSE_BSS=n > > > CONFIG_TPMFRONT=y > > > > Grub does use LWIP, and just does not want mini-os to start network > > automatically, grub does so by itself from minios_probe. > > Are you sure? LWIPDIR isn't being set for building grub-stubdom. How > does this work? Ah, sorry, grub implements tcp/ip itself indeed, so it's only netfront that stubdom-grub needs. Samuel
Juergen Gross, le sam. 05 oct. 2024 17:15:46 +0200, a ecrit: > Today the Mini-OS build systems derives libc and lwip config options > from the stubdom and LWIPDIR make variables supplied by the Xen build > system. > > In order to prepare those being explicit Mini-OS config options, add > them to the related stubdom Mini-OS config files. > > While at it remove the CONFIG_START_NETWORK setting from config files > disabling lwip, as CONFIG_START_NETWORK requires lwip for becoming > effective. > > Signed-off-by: Juergen Gross <jgross@suse.com> Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org> > --- > stubdom/c/minios.cfg | 2 ++ > stubdom/grub/minios.cfg | 3 ++- > stubdom/ioemu-minios.cfg | 2 ++ > stubdom/vtpm/minios.cfg | 3 ++- > stubdom/vtpmmgr/minios.cfg | 3 ++- > stubdom/xenstore-minios.cfg | 1 + > stubdom/xenstorepvh-minios.cfg | 1 + > 7 files changed, 12 insertions(+), 3 deletions(-) > > diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg > index e69de29bb2..56d65510cd 100644 > --- a/stubdom/c/minios.cfg > +++ b/stubdom/c/minios.cfg > @@ -0,0 +1,2 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=y > diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg > index 8df49092cd..5145b357e0 100644 > --- a/stubdom/grub/minios.cfg > +++ b/stubdom/grub/minios.cfg > @@ -1,3 +1,4 @@ > -CONFIG_START_NETWORK=n > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_SPARSE_BSS=n > CONFIG_TPMFRONT=y > diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg > index a65baa3765..6153ae05f8 100644 > --- a/stubdom/ioemu-minios.cfg > +++ b/stubdom/ioemu-minios.cfg > @@ -1,3 +1,5 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=y > CONFIG_START_NETWORK=n > CONFIG_QEMU_XS_ARGS=y > CONFIG_PCIFRONT=y > diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg > index 31652ee4f2..22f66f1351 100644 > --- a/stubdom/vtpm/minios.cfg > +++ b/stubdom/vtpm/minios.cfg > @@ -1,7 +1,8 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_TPMFRONT=y > CONFIG_TPM_TIS=n > CONFIG_TPMBACK=y > -CONFIG_START_NETWORK=n > CONFIG_TEST=n > CONFIG_PCIFRONT=n > CONFIG_BLKFRONT=y > diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg > index 3fb383d30f..a9f13a2fd2 100644 > --- a/stubdom/vtpmmgr/minios.cfg > +++ b/stubdom/vtpmmgr/minios.cfg > @@ -1,7 +1,8 @@ > +CONFIG_LIBC=y > +CONFIG_LWIP=n > CONFIG_TPMFRONT=y > CONFIG_TPM_TIS=y > CONFIG_TPMBACK=y > -CONFIG_START_NETWORK=n > CONFIG_TEST=n > CONFIG_PCIFRONT=n > CONFIG_BLKFRONT=y > diff --git a/stubdom/xenstore-minios.cfg b/stubdom/xenstore-minios.cfg > index 239da519b9..0252b59432 100644 > --- a/stubdom/xenstore-minios.cfg > +++ b/stubdom/xenstore-minios.cfg > @@ -1,3 +1,4 @@ > +CONFIG_LIBC=y > CONFIG_BLKFRONT=n > CONFIG_NETFRONT=n > CONFIG_FBFRONT=n > diff --git a/stubdom/xenstorepvh-minios.cfg b/stubdom/xenstorepvh-minios.cfg > index 752b90d7d3..62a228f33d 100644 > --- a/stubdom/xenstorepvh-minios.cfg > +++ b/stubdom/xenstorepvh-minios.cfg > @@ -1,3 +1,4 @@ > +CONFIG_LIBC=y > CONFIG_PARAVIRT=n > CONFIG_BLKFRONT=n > CONFIG_NETFRONT=n > -- > 2.43.0 >
diff --git a/stubdom/c/minios.cfg b/stubdom/c/minios.cfg index e69de29bb2..56d65510cd 100644 --- a/stubdom/c/minios.cfg +++ b/stubdom/c/minios.cfg @@ -0,0 +1,2 @@ +CONFIG_LIBC=y +CONFIG_LWIP=y diff --git a/stubdom/grub/minios.cfg b/stubdom/grub/minios.cfg index 8df49092cd..5145b357e0 100644 --- a/stubdom/grub/minios.cfg +++ b/stubdom/grub/minios.cfg @@ -1,3 +1,4 @@ -CONFIG_START_NETWORK=n +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_SPARSE_BSS=n CONFIG_TPMFRONT=y diff --git a/stubdom/ioemu-minios.cfg b/stubdom/ioemu-minios.cfg index a65baa3765..6153ae05f8 100644 --- a/stubdom/ioemu-minios.cfg +++ b/stubdom/ioemu-minios.cfg @@ -1,3 +1,5 @@ +CONFIG_LIBC=y +CONFIG_LWIP=y CONFIG_START_NETWORK=n CONFIG_QEMU_XS_ARGS=y CONFIG_PCIFRONT=y diff --git a/stubdom/vtpm/minios.cfg b/stubdom/vtpm/minios.cfg index 31652ee4f2..22f66f1351 100644 --- a/stubdom/vtpm/minios.cfg +++ b/stubdom/vtpm/minios.cfg @@ -1,7 +1,8 @@ +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_TPMFRONT=y CONFIG_TPM_TIS=n CONFIG_TPMBACK=y -CONFIG_START_NETWORK=n CONFIG_TEST=n CONFIG_PCIFRONT=n CONFIG_BLKFRONT=y diff --git a/stubdom/vtpmmgr/minios.cfg b/stubdom/vtpmmgr/minios.cfg index 3fb383d30f..a9f13a2fd2 100644 --- a/stubdom/vtpmmgr/minios.cfg +++ b/stubdom/vtpmmgr/minios.cfg @@ -1,7 +1,8 @@ +CONFIG_LIBC=y +CONFIG_LWIP=n CONFIG_TPMFRONT=y CONFIG_TPM_TIS=y CONFIG_TPMBACK=y -CONFIG_START_NETWORK=n CONFIG_TEST=n CONFIG_PCIFRONT=n CONFIG_BLKFRONT=y diff --git a/stubdom/xenstore-minios.cfg b/stubdom/xenstore-minios.cfg index 239da519b9..0252b59432 100644 --- a/stubdom/xenstore-minios.cfg +++ b/stubdom/xenstore-minios.cfg @@ -1,3 +1,4 @@ +CONFIG_LIBC=y CONFIG_BLKFRONT=n CONFIG_NETFRONT=n CONFIG_FBFRONT=n diff --git a/stubdom/xenstorepvh-minios.cfg b/stubdom/xenstorepvh-minios.cfg index 752b90d7d3..62a228f33d 100644 --- a/stubdom/xenstorepvh-minios.cfg +++ b/stubdom/xenstorepvh-minios.cfg @@ -1,3 +1,4 @@ +CONFIG_LIBC=y CONFIG_PARAVIRT=n CONFIG_BLKFRONT=n CONFIG_NETFRONT=n
Today the Mini-OS build systems derives libc and lwip config options from the stubdom and LWIPDIR make variables supplied by the Xen build system. In order to prepare those being explicit Mini-OS config options, add them to the related stubdom Mini-OS config files. While at it remove the CONFIG_START_NETWORK setting from config files disabling lwip, as CONFIG_START_NETWORK requires lwip for becoming effective. Signed-off-by: Juergen Gross <jgross@suse.com> --- stubdom/c/minios.cfg | 2 ++ stubdom/grub/minios.cfg | 3 ++- stubdom/ioemu-minios.cfg | 2 ++ stubdom/vtpm/minios.cfg | 3 ++- stubdom/vtpmmgr/minios.cfg | 3 ++- stubdom/xenstore-minios.cfg | 1 + stubdom/xenstorepvh-minios.cfg | 1 + 7 files changed, 12 insertions(+), 3 deletions(-)