[PATCH 0/3] stubdom: reduce xenstore library dependencies

[PATCH 0/3] stubdom: reduce xenstore library dependencies

[Juergen Gross]

Instead of letting the xenstore stubdoms depend on libxenguest and
with that on basically all Xen libraries, only let it depend on the
actually used libraries.

This is in preparation of removing the libxenctrl dependency from
Xenstore and with that the capability to use xenstore-stubdom on
multiple hypervisor versions.

Juergen Gross (3):
  config: update Mini-OS commit
  tools/xenstored: remove unneeded libxenguest reference
  stubdom: use real lib dependencies for xenstore stubdoms

 Config.mk                       | 2 +-
 stubdom/Makefile                | 6 ++++--
 tools/xenstored/Makefile.common | 1 -
 3 files changed, 5 insertions(+), 4 deletions(-)

-- 
2.43.0

[PATCH 1/3] config: update Mini-OS commit

[Juergen Gross]

Update the Mini-OS upstream revision.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 Config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Config.mk b/Config.mk
index 1a3938b6c4..6dd2f9439c 100644
--- a/Config.mk
+++ b/Config.mk
@@ -224,7 +224,7 @@ QEMU_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/qemu-xen.git
 QEMU_UPSTREAM_REVISION ?= master
 
 MINIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/mini-os.git
-MINIOS_UPSTREAM_REVISION ?= 8b038c7411ae7e823eaf6d15d5efbe037a07197a
+MINIOS_UPSTREAM_REVISION ?= 80ef70f92cb7b95ef48deea1157f2194b10b8c05
 
 SEABIOS_UPSTREAM_URL ?= https://xenbits.xen.org/git-http/seabios.git
 SEABIOS_UPSTREAM_REVISION ?= rel-1.16.3
-- 
2.43.0

[PATCH 2/3] tools/xenstored: remove unneeded libxenguest reference

[Juergen Gross]

Today the xenstored Makefile contains an unneeded reference to the
not used libxenguest library.

Remove it.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 tools/xenstored/Makefile.common | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/xenstored/Makefile.common b/tools/xenstored/Makefile.common
index ef63ef650c..27fdb3b49e 100644
--- a/tools/xenstored/Makefile.common
+++ b/tools/xenstored/Makefile.common
@@ -13,7 +13,6 @@ XENSTORED_OBJS-$(CONFIG_MiniOS) += minios.o lu_minios.o
 CFLAGS += -include $(XEN_ROOT)/tools/config.h
 CFLAGS += $(CFLAGS_libxenevtchn)
 CFLAGS += $(CFLAGS_libxenctrl)
-CFLAGS += $(CFLAGS_libxenguest)
 CFLAGS += $(CFLAGS_libxentoolcore)
 
 $(XENSTORED_OBJS-y): CFLAGS += $(CFLAGS_libxengnttab)
-- 
2.43.0

[PATCH 3/3] stubdom: use real lib dependencies for xenstore stubdoms

[Juergen Gross]

Today the build of Xenstore stubdoms depend on libxenguest just because
libxenguest depends on all needed libraries. In reality there is no
dependency on libxenguest for Xenstore stubdoms.

Use the actual dependencies instead.

Signed-off-by: Juergen Gross <jgross@suse.com>
---
 stubdom/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/stubdom/Makefile b/stubdom/Makefile
index 6ed4253b25..2a81af28a1 100644
--- a/stubdom/Makefile
+++ b/stubdom/Makefile
@@ -523,12 +523,14 @@ else
 pv-grub-if-enabled:
 endif
 
+XENSTORE_DEPS := libxenevtchn libxengnttab libxenctrl
+
 .PHONY: xenstore-stubdom
-xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore
+xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore $(XENSTORE_DEPS) xenstore
 	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a
 
 .PHONY: xenstorepvh-stubdom
-xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh libxenguest xenstorepvh
+xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh $(XENSTORE_DEPS) xenstorepvh
 	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstorepvh-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstorepvh/xenstored.a
 
 #########
-- 
2.43.0

Re: [PATCH 3/3] stubdom: use real lib dependencies for xenstore stubdoms

[Samuel Thibault]

Juergen Gross, le jeu. 10 oct. 2024 17:54:59 +0200, a ecrit:
> Today the build of Xenstore stubdoms depend on libxenguest just because
> libxenguest depends on all needed libraries. In reality there is no
> dependency on libxenguest for Xenstore stubdoms.
> 
> Use the actual dependencies instead.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Reviewed-by: Samuel Thibault <samuel.thibault@ens-lyon.org>

> ---
>  stubdom/Makefile | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/stubdom/Makefile b/stubdom/Makefile
> index 6ed4253b25..2a81af28a1 100644
> --- a/stubdom/Makefile
> +++ b/stubdom/Makefile
> @@ -523,12 +523,14 @@ else
>  pv-grub-if-enabled:
>  endif
>  
> +XENSTORE_DEPS := libxenevtchn libxengnttab libxenctrl
> +
>  .PHONY: xenstore-stubdom
> -xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore libxenguest xenstore
> +xenstore-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstore $(XENSTORE_DEPS) xenstore
>  	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstore-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstore/xenstored.a
>  
>  .PHONY: xenstorepvh-stubdom
> -xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh libxenguest xenstorepvh
> +xenstorepvh-stubdom: mini-os-$(XEN_TARGET_ARCH)-xenstorepvh $(XENSTORE_DEPS) xenstorepvh
>  	DEF_CPPFLAGS="$(TARGET_CPPFLAGS)" DEF_CFLAGS="$(TARGET_CFLAGS)" DEF_LDFLAGS="$(TARGET_LDFLAGS)" MINIOS_CONFIG="$(CURDIR)/xenstorepvh-minios.gen.cfg" $(MAKE) DESTDIR= -C $(MINI_OS) OBJ_DIR=$(CURDIR)/$< APP_OBJS=$(CURDIR)/xenstorepvh/xenstored.a
>  
>  #########
> -- 
> 2.43.0

Re: [PATCH 0/3] stubdom: reduce xenstore library dependencies

[Andrew Cooper]

On 10/10/2024 4:54 pm, Juergen Gross wrote:
> Instead of letting the xenstore stubdoms depend on libxenguest and
> with that on basically all Xen libraries, only let it depend on the
> actually used libraries.
>
> This is in preparation of removing the libxenctrl dependency from
> Xenstore and with that the capability to use xenstore-stubdom on
> multiple hypervisor versions.
>
> Juergen Gross (3):
>   config: update Mini-OS commit
>   tools/xenstored: remove unneeded libxenguest reference
>   stubdom: use real lib dependencies for xenstore stubdoms
>
>  Config.mk                       | 2 +-
>  stubdom/Makefile                | 6 ++++--
>  tools/xenstored/Makefile.common | 1 -
>  3 files changed, 5 insertions(+), 4 deletions(-)
>

Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

Re: [PATCH 2/3] tools/xenstored: remove unneeded libxenguest reference

[Anthony PERARD]

On Thu, Oct 10, 2024 at 05:54:58PM +0200, Juergen Gross wrote:
> Today the xenstored Makefile contains an unneeded reference to the
> not used libxenguest library.
> 
> Remove it.
> 
> Signed-off-by: Juergen Gross <jgross@suse.com>

Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>

Thanks,

-- 

Anthony Perard | Vates XCP-ng Developer

XCP-ng & Xen Orchestra - Vates solutions

web: https://vates.tech