Skip to contentSkip to conversation

stubdom: remove c-stubdom

PATCH In review Juergen Gross 3 participants 6 messages Jul 6

lore
Share & tools
lore
#0 lore raw

v2 cover stubdom: remove c-stubdom

Remove the example stunbdom "c-stubdom".

Changes in V2:
- add patch 2

Juergen Gross (2):
stubdom: remove c-stubdom
CHANGELOG: add entry for removed c-stubdom

 CHANGELOG.md         |  1 +
 stubdom/Makefile     | 19 -------------------
 stubdom/c/Makefile   | 13 -------------
 stubdom/c/main.c     |  8 --------
 stubdom/c/minios.cfg |  2 --
 stubdom/configure    | 44 --------------------------------------------
 stubdom/configure.ac |  1 -
 7 files changed, 1 insertion(+), 87 deletions(-)
 delete mode 100644 stubdom/c/Makefile
 delete mode 100644 stubdom/c/main.c
 delete mode 100644 stubdom/c/minios.cfg
Signature · 1 line
2.54.0
#1 lore raw

PATCH v2 1/2 stubdom: remove c-stubdom

C-stubdom was meant as a base for building new Mini-OS based stubdoms. It hasn't seen any work for many years now and creating new stubdoms should use UNIKRAFT instead of Mini-OS.

So remove c-stubdom.

---
 stubdom/Makefile     | 19 -------------------
 stubdom/c/Makefile   | 13 -------------
 stubdom/c/main.c     |  8 --------
 stubdom/c/minios.cfg |  2 --
 stubdom/configure    | 44 --------------------------------------------
 stubdom/configure.ac |  1 -
 6 files changed, 87 deletions(-)
 delete mode 100644 stubdom/c/Makefile
 delete mode 100644 stubdom/c/main.c
 delete mode 100644 stubdom/c/minios.cfg
stubdom/Makefile +0 -19
index 9aa0d3dee4..acd5e56f16 100644
@@ -339,17 +339,6 @@ $(TARGETS_MINIOS): mini-os-%:
                 mkdir -p $@/$$i ; \
 	done
 
-###
-# C
-###
-
-c-minios-config.mk: $(CURDIR)/c/minios.cfg
-	MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config
-
-.PHONY: c
-c: $(CROSS_ROOT) c-minios-config.mk
-	CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat c-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) 
-
 ######
 # VTPM
 ######
@@ -432,10 +421,6 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk
 # minios
 ########
 
-.PHONY: c-stubdom
-c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c
-	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a
-
 .PHONY: vtpm-stubdom
 vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm vtpm
 	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp -lpolarssl"
@@ -485,8 +470,6 @@ else
 install-grub-if-enabled:
 endif
 
-install-c: c-stubdom
-
 install-xenstore: xenstore-stubdom
 	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
 	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/xenstore-stubdom.gz"
@@ -540,13 +523,11 @@ uninstall-vtpmmgr:
 .PHONY: clean
 clean: $(foreach lib,$(STUB_LIBS),clean-libxen$(lib))
 clean:
-	rm -fr mini-os-$(XEN_TARGET_ARCH)-c
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-grub
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstorepvh
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
 	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
-	$(MAKE) DESTDIR= -C c clean
 	$(MAKE) -C vtpm clean
 	$(MAKE) -C vtpmmgr clean
 	rm -fr grub-$(XEN_TARGET_ARCH)
stubdom/c/Makefile deleted +0 -13
deleted file mode 100644
index b252dcad0b..0000000000
@@ -1,13 +0,0 @@
-XEN_ROOT = $(CURDIR)/../..
-
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
-include $(XEN_ROOT)/Config.mk
-endif
-
-all: main.a
-
-main.a: main.o 
-	$(AR) cr $@ $^
-
-clean:
-	rm -f *.a *.o
stubdom/c/main.c deleted +0 -8
deleted file mode 100644
index f97a0f72d4..0000000000
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-int main(void) {
-        sleep(2);
-        printf("Hello, world!\n");
-        return 0;
-}
stubdom/c/minios.cfg deleted +0 -2
deleted file mode 100644
index 56d65510cd..0000000000
@@ -1,2 +0,0 @@
-CONFIG_LIBC=y
-CONFIG_LWIP=y
stubdom/configure +0 -44

68 lines not on this page · raw message

stubdom/configure.ac +0 -1
index f07b08c5b3..33f170144e 100644
@@ -18,7 +18,6 @@ m4_include([../m4/depends.m4])
 m4_include([../m4/fetcher.m4])
 
 # Enable/disable stub domains
-AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c])
 AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub])
 AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore])
 AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh])
Signature · 1 line
2.54.0
Reviewed-by on v2 1/2
#2 lore raw

Le 06/07/2026 à 11:08, Juergen Gross a écrit :

Quoted 198 lines

C-stubdom was meant as a base for building new Mini-OS based stubdoms. It hasn't seen any work for many years now and creating new stubdoms should use UNIKRAFT instead of Mini-OS.

So remove c-stubdom.

---
  stubdom/Makefile     | 19 -------------------
  stubdom/c/Makefile   | 13 -------------
  stubdom/c/main.c     |  8 --------
  stubdom/c/minios.cfg |  2 --
  stubdom/configure    | 44 --------------------------------------------
  stubdom/configure.ac |  1 -
  6 files changed, 87 deletions(-)

delete mode 100644 stubdom/c/Makefile
delete mode 100644 stubdom/c/main.c
delete mode 100644 stubdom/c/minios.cfg

stubdom/Makefile +0 -19
index 9aa0d3dee4..acd5e56f16 100644
@@ -339,17 +339,6 @@ $(TARGETS_MINIOS): mini-os-%:
                  mkdir -p $@/$$i ; \
  	done
 
-###
-# C
-###
-
-c-minios-config.mk: $(CURDIR)/c/minios.cfg
-	MINIOS_CONFIG="$<" CONFIG_FILE="$(CURDIR)/$@" $(MAKE) DESTDIR= -C $(MINI_OS) config
-
-.PHONY: c
-c: $(CROSS_ROOT) c-minios-config.mk
-	CPPFLAGS="$(TARGET_CPPFLAGS) $(shell cat c-minios-config.mk)" CFLAGS="$(TARGET_CFLAGS)" $(MAKE) DESTDIR= -C $@ LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH)
-
  ######
  # VTPM
  ######
@@ -432,10 +421,6 @@ xenstorepvh: $(CROSS_ROOT) xenstorepvh-minios-config.mk
  # minios
  ########
 
-.PHONY: c-stubdom
-c-stubdom: mini-os-$(XEN_TARGET_ARCH)-c lwip-$(XEN_TARGET_ARCH) libxenguest c
-	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/c/minios.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) APP_OBJS=$(CURDIR)/c/main.a
-
  .PHONY: vtpm-stubdom
  vtpm-stubdom: mini-os-$(XEN_TARGET_ARCH)-vtpm vtpm
  	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/vtpm/minios.cfg" $(MAKE) -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS="$(CURDIR)/vtpm/vtpm.a" APP_LDLIBS="-ltpm -ltpm_crypto -lgmp -lpolarssl"
@@ -485,8 +470,6 @@ else
  install-grub-if-enabled:
  endif
 
-install-c: c-stubdom
-
  install-xenstore: xenstore-stubdom
  	$(INSTALL_DIR) "$(DESTDIR)$(XENFIRMWAREDIR)"
  	$(INSTALL_DATA) mini-os-$(XEN_TARGET_ARCH)-xenstore/mini-os.gz "$(DESTDIR)$(XENFIRMWAREDIR)/xenstore-stubdom.gz"
@@ -540,13 +523,11 @@ uninstall-vtpmmgr:
  .PHONY: clean
  clean: $(foreach lib,$(STUB_LIBS),clean-libxen$(lib))
  clean:
-	rm -fr mini-os-$(XEN_TARGET_ARCH)-c
  	rm -fr mini-os-$(XEN_TARGET_ARCH)-grub
  	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstore
  	rm -fr mini-os-$(XEN_TARGET_ARCH)-xenstorepvh
  	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpm
  	rm -fr mini-os-$(XEN_TARGET_ARCH)-vtpmmgr
-	$(MAKE) DESTDIR= -C c clean
  	$(MAKE) -C vtpm clean
  	$(MAKE) -C vtpmmgr clean
  	rm -fr grub-$(XEN_TARGET_ARCH)
stubdom/c/Makefile deleted +0 -13
deleted file mode 100644
index b252dcad0b..0000000000
@@ -1,13 +0,0 @@
-XEN_ROOT = $(CURDIR)/../..
-
-ifeq (,$(findstring clean,$(MAKECMDGOALS)))
-include $(XEN_ROOT)/Config.mk
-endif
-
-all: main.a
-
-main.a: main.o
-	$(AR) cr $@ $^
-
-clean:
-	rm -f *.a *.o
stubdom/c/main.c deleted +0 -8
deleted file mode 100644
index f97a0f72d4..0000000000
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-
-int main(void) {
-        sleep(2);
-        printf("Hello, world!\n");
-        return 0;
-}
stubdom/c/minios.cfg deleted +0 -2
deleted file mode 100644
index 56d65510cd..0000000000
@@ -1,2 +0,0 @@
-CONFIG_LIBC=y
-CONFIG_LWIP=y
stubdom/configure +0 -44
index e127ef44eb..8a0a798bd2 100755
@@ -661,7 +661,6 @@ debug
  xenstorepvh
  xenstore
  grub
-c
  host_os
  host_vendor
  host_cpu
@@ -712,7 +711,6 @@ SHELL'
  ac_subst_files=''
  ac_user_opts='
  enable_option_checking
-enable_c_stubdom
  enable_pv_grub
  enable_xenstore_stubdom
  enable_xenstorepvh_stubdom
@@ -1360,7 +1358,6 @@ Optional Features:
    --disable-option-checking  ignore unrecognized --enable/--with options
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-c-stubdom      Build and install c-stubdom (default is DISABLED)
    --enable-pv-grub        Build and install pv-grub (default is DISABLED)
    --disable-xenstore-stubdom
                            Build and install xenstore-stubdom (default is
@@ -2406,47 +2403,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
  # Enable/disable stub domains
 
-# Check whether --enable-c-stubdom was given.
-if test ${enable_c_stubdom+y}
-then :
-  enableval=$enable_c_stubdom;
-
-if test "x$enableval" = "xyes"
-then :
-
-
-c=y
-STUBDOM_TARGETS="$STUBDOM_TARGETS c"
-STUBDOM_BUILD="$STUBDOM_BUILD c-stubdom"
-STUBDOM_INSTALL="$STUBDOM_INSTALL install-c"
-STUBDOM_UNINSTALL="$STUBDOM_UNINSTALL install-c"
-
-
-else $as_nop
-
-if test "x$enableval" = "xno"
-then :
-
-
-c=n
-
-
-fi
-
-fi
-
-
-else $as_nop
-
-
-c=n
-
-
-fi
-
-
-
-
  # Check whether --enable-pv-grub was given.
  if test ${enable_pv_grub+y}
  then :
stubdom/configure.ac +0 -0
index f07b08c5b3..33f170144e 100644

stubdom/configure.ac m4_include([../m4/depends.m4]) · line 23

Quoted 7 lines
stubdom/configure.ac +0 -1
@@ -18,7 +18,6 @@ m4_include([../m4/depends.m4])
  m4_include([../m4/fetcher.m4])
 
  # Enable/disable stub domains
-AX_STUBDOM_DEFAULT_DISABLE([c-stubdom], [c])
  AX_STUBDOM_DEFAULT_DISABLE([pv-grub], [grub])
  AX_STUBDOM_DEFAULT_ENABLE([xenstore-stubdom], [xenstore])
  AX_STUBDOM_DEFAULT_ENABLE([xenstorepvh-stubdom], [xenstorepvh])
#3 lore raw

PATCH v2 2/2 CHANGELOG: add entry for removed c-stubdom

In reply to Juergen Gross
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)
CHANGELOG.md +1 -0
index ef4e6ae9c4..fc9840c5d2 100644
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
    - The kexec "v1" interface, which was declared obsolete in Xen 4.4 (2013).
      The only known user was the classic-xen fork of Linux.  This does not
      affect Xen kexec support in the kexec-tools package.
+   - The example stubdom "c-stubdom" has been removed.
 
 ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
 
Signature · 1 line
2.54.0
Reviewed-by on v2 2/2
#4 lore raw

Re: [PATCH v2 2/2] CHANGELOG: add entry for removed c-stubdom

Le 06/07/2026 à 11:08, Juergen Gross a écrit :

Quoted 10 lines
---
  CHANGELOG.md | 1 +
  1 file changed, 1 insertion(+)
CHANGELOG.md +0 -0
index ef4e6ae9c4..fc9840c5d2 100644

CHANGELOG.md The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) · line 21

Quoted 7 lines
CHANGELOG.md +1 -0
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
     - The kexec "v1" interface, which was declared obsolete in Xen 4.4 (2013).
       The only known user was the classic-xen fork of Linux.  This does not
       affect Xen kexec support in the kexec-tools package.
+   - The example stubdom "c-stubdom" has been removed.
 
  ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
 
Acked-by on v2 2/2
#5 lore raw

Re: [PATCH v2 2/2] CHANGELOG: add entry for removed c-stubdom

In reply to Juergen Gross
Quoted 10 lines · Juergen Gross
---
  CHANGELOG.md | 1 +
  1 file changed, 1 insertion(+)
CHANGELOG.md +0 -0
index ef4e6ae9c4..fc9840c5d2 100644

CHANGELOG.md The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) · line 21

Quoted 7 lines
CHANGELOG.md +1 -0
@@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
     - The kexec "v1" interface, which was declared obsolete in Xen 4.4 (2013).
       The only known user was the classic-xen fork of Linux.  This does not
       affect Xen kexec support in the kexec-tools package.
+   - The example stubdom "c-stubdom" has been removed.
 
  ## [4.22.0 UNRELEASED](https://xenbits.xenproject.org/gitweb/?p=xen.git;a=shortlog;h=staging) - TBD
 

Thanks.

~ Oleksii