8 files changed, 187 insertions, 85 deletions

diff --git a/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch b/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch
new file mode 100644
index 00000000..637d6fe5
--- /dev/null
+++ b/recipes-extended/xen/files/0001-arm-silence-gcc14-warning-error-on-irq-bounds-check.patch
@@ -0,0 +1,65 @@
+From 2258853a19b2d0b1fafd901cddf69f730c38d450 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Fri, 31 May 2024 14:50:33 +0000
+Subject: [PATCH] arm: silence gcc14 warning (error) on irq bounds check
+
+While we wait for upstream to update to gcc14, we add a quick
+check to avoid gcc14 not being able to confirm that IRQ is
+greater than 0 and hence throws a warning, which leads to an
+error.
+
+| In function '__irq_to_desc',
+|     inlined from 'route_irq_to_guest' at arch/arm/irq.c:467:12:
+| arch/arm/irq.c:65:16: error: array subscript -2 is below array bounds of 'irq_desc_t[32]' {aka 'struct irq_desc[32]'} [-Werror=array-bounds=]
+|    65 |         return &this_cpu(local_irq_desc)[irq];
+|       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Upstream-Status: Pending [the xen folks understand the code and the right fix .. I don't]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ xen/arch/arm/irq.c | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+Index: git/xen/arch/arm/irq.c
+===================================================================
+--- git.orig/xen/arch/arm/irq.c
++++ git/xen/arch/arm/irq.c
+@@ -48,8 +48,13 @@ void irq_end_none(struct irq_desc *irq)
+ static irq_desc_t irq_desc[NR_IRQS];
+ static DEFINE_PER_CPU(irq_desc_t[NR_LOCAL_IRQS], local_irq_desc);
+ 
++
+ struct irq_desc *__irq_to_desc(int irq)
+ {
++    /* silence gcc14 warning */
++    if ( irq < 0 )
++        return &this_cpu(local_irq_desc)[0];
++
+     if ( irq < NR_LOCAL_IRQS )
+         return &this_cpu(local_irq_desc)[irq];
+ 
+@@ -722,16 +727,16 @@ int platform_get_irq(const struct dt_dev
+ 
+ int platform_get_irq_byname(const struct dt_device_node *np, const char *name)
+ {
+-       int index;
++        int index;
+ 
+-       if ( unlikely(!name) )
+-               return -EINVAL;
++        if ( unlikely(!name) )
++                return -EINVAL;
+ 
+-       index = dt_property_match_string(np, "interrupt-names", name);
+-       if ( index < 0 )
+-               return index;
++        index = dt_property_match_string(np, "interrupt-names", name);
++        if ( index < 0 )
++                return index;
+ 
+-       return platform_get_irq(np, index);
++        return platform_get_irq(np, index);
+ }
+ 
+ /*
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
deleted file mode 100644
index 476f5ddc..00000000
--- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 6db88791d923167f160afbcadeffad84a4cbdbc5 Mon Sep 17 00:00:00 2001
-Message-Id: <6db88791d923167f160afbcadeffad84a4cbdbc5.1612262706.git.bertrand.marquis@arm.com>
-From: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
-Date: Fri, 19 Oct 2018 11:01:37 +0200
-Subject: [PATCH] python,pygrub: pass DISTUTILS env vars as setup.py args
-
-Upstream-Status: Inappropriate [oe specific, python install issues]
-
-Allow to respect the target install dir (PYTHON_SITEPACKAGES_DIR)
-as well as other parameters set by the OpenEmbedded build system.
-This is especially useful when the target libdir is not the default one
-(/usr/lib), but for example /usr/lib64.
-
-Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com>
-
-Forward-ported to Xen 4.12.0
-Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
-
-Modified to support pygrub installation with python 3
-Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
-
-Forward-ported to Xen 4.14.0
-Signed-off-by: Christopher Clark <christopher.clark6@baesystems.com>
-
-Forward-ported to Xen 4.15.0
-Signed-off-by: Bertrand Marquis <bertrand.marquis@arm.com>
-
----
- tools/pygrub/Makefile | 7 +++++--
- tools/python/Makefile | 2 +-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
-index 37b2146214..ffb9270065 100644
---- a/tools/pygrub/Makefile
-+++ b/tools/pygrub/Makefile
-@@ -10,7 +10,7 @@ INSTALL_LOG = build/installed_files.txt
- all: build
- .PHONY: build
- build:
--       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build
-+       CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py build $(DISTUTILS_BUILD_ARGS)
- 
- .PHONY: install
- install: all
-@@ -18,7 +18,10 @@ install: all
-        CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" \
-                LDFLAGS="$(PY_LDFLAGS)" $(PYTHON) setup.py install \
-                --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
--                --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force
-+                --root="$(DESTDIR)" --install-scripts=$(LIBEXEC_BIN) --force \
-+                $(DISTUTILS_INSTALL_ARGS)
-+       rm -f $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-+       $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
-                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
-                     "`readlink -f $(LIBEXEC_BIN)`" ]; then \
-diff --git a/tools/python/Makefile b/tools/python/Makefile
-index cc76423647..5cb11ae453 100644
---- a/tools/python/Makefile
-+++ b/tools/python/Makefile
-@@ -12,7 +12,7 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
-            SHLIB_libxenctrl="$(SHLIB_libxenctrl)" \
-            SHLIB_libxenguest="$(SHLIB_libxenguest)" \
-            SHLIB_libxenstore="$(SHLIB_libxenstore)" \
--           $(PYTHON) setup.py
-+           $(PYTHON) setup.py $(DISTUTILS_BUILD_ARGS)
- 
- .PHONY: build
- build:
--- 
-2.17.1
-
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch
index 7ac1a399..bfd1acb4 100644
--- a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
+++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.19.patch
@@ -1,10 +1,10 @@
 Upstream-Status: Pending
 
-diff --git a/tools/pygrub/Makefile b/tools/pygrub/Makefile
-index 4963bc89c6..c1c05eb421 100644
---- a/tools/pygrub/Makefile
-+++ b/tools/pygrub/Makefile
-@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+Index: git/tools/pygrub/Makefile
+===================================================================
+--- git.orig/tools/pygrub/Makefile
++++ git/tools/pygrub/Makefile
+@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
  all: build
  .PHONY: build
  build:
@@ -19,13 +19,13 @@ index 4963bc89c6..c1c05eb421 100644
 -               --root="$(DESTDIR)" --force
 +               --root="$(DESTDIR)" --force  $(DISTUTILS_INSTALL_ARGS)
         $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
-        set -e; if [ $(bindir) != $(LIBEXEC_BIN) -a \
-                     "`readlink -f $(DESTDIR)/$(bindir)`" != \
-diff --git a/tools/python/Makefile b/tools/python/Makefile
-index 437431c48e..0a99c2067e 100644
---- a/tools/python/Makefile
-+++ b/tools/python/Makefile
-@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAGS)" LDSHARED="$(CC)" LDFLAGS="$(PY_LDFLA
+ 
+ .PHONY: uninstall
+Index: git/tools/python/Makefile
+===================================================================
+--- git.orig/tools/python/Makefile
++++ git/tools/python/Makefile
+@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
  
  .PHONY: build
  build:
diff --git a/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch
new file mode 100644
index 00000000..bfd1acb4
--- /dev/null
+++ b/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.20.patch
@@ -0,0 +1,43 @@
+Upstream-Status: Pending
+
+Index: git/tools/pygrub/Makefile
+===================================================================
+--- git.orig/tools/pygrub/Makefile
++++ git/tools/pygrub/Makefile
+@@ -13,14 +13,14 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
+ all: build
+ .PHONY: build
+ build:
+-       $(setup.py) build
++       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install: all
+        $(INSTALL_DIR) $(DESTDIR)/$(bindir)
+        $(INSTALL_DIR) $(DESTDIR)/$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
++               --root="$(DESTDIR)" --force  $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) src/pygrub $(DESTDIR)/$(LIBEXEC_BIN)/pygrub
+ 
+ .PHONY: uninstall
+Index: git/tools/python/Makefile
+===================================================================
+--- git.orig/tools/python/Makefile
++++ git/tools/python/Makefile
+@@ -16,13 +16,13 @@ setup.py = CC="$(CC)" CFLAGS="$(PY_CFLAG
+ 
+ .PHONY: build
+ build:
+-       $(setup.py) build
++       $(setup.py) build $(DISTUTILS_BUILD_ARGS)
+ 
+ .PHONY: install
+ install:
+        $(INSTALL_DIR) $(DESTDIR)$(LIBEXEC_BIN)
+        $(setup.py) install --record $(INSTALL_LOG) $(PYTHON_PREFIX_ARG) \
+-               --root="$(DESTDIR)" --force
++               --root="$(DESTDIR)" --force $(DISTUTILS_INSTALL_ARGS)
+        $(INSTALL_PYTHON_PROG) scripts/convert-legacy-stream $(DESTDIR)$(LIBEXEC_BIN)
+        $(INSTALL_PYTHON_PROG) scripts/verify-stream-v2 $(DESTDIR)$(LIBEXEC_BIN)
+ 
diff --git a/recipes-extended/xen/files/0001-xen-fix-header-guard-inconsistencies-gcc15.patch b/recipes-extended/xen/files/0001-xen-fix-header-guard-inconsistencies-gcc15.patch
new file mode 100644
index 00000000..4b2c0bdf
--- /dev/null
+++ b/recipes-extended/xen/files/0001-xen-fix-header-guard-inconsistencies-gcc15.patch
@@ -0,0 +1,54 @@
+From 70f96461462a5a0437398022aa71a2033c8c5c3a Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@gmail.com>
+Date: Thu, 15 May 2025 14:26:47 -0400
+Subject: [PATCH] xen: fix header guard inconsistencies (gcc15)
+
+Fixing the following header inconsistencies
+
+   | In file included from arch/arm/platforms/midway.c:22:
+   | ./arch/arm/include/asm/platforms/midway.h:1: error: header guard '__ASM_ARM_PLATFORMS_MIDWAY_H' followed by '#define' of a different macro [-Werror=header-guard]
+   |     1 | #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H
+   | ./arch/arm/include/asm/platforms/midway.h:2: note: '__ASM_ASM_PLATFORMS_MIDWAY_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_MIDWAY_H'?
+   |     2 | #define __ASM_ASM_PLATFORMS_MIDWAY_H
+   | In file included from arch/arm/platforms/omap5.c:21:
+   | ./arch/arm/include/asm/platforms/omap5.h:1: error: header guard '__ASM_ARM_PLATFORMS_OMAP5_H' followed by '#define' of a different macro [-Werror=header-guard]
+   |     1 | #ifndef __ASM_ARM_PLATFORMS_OMAP5_H
+   | ./arch/arm/include/asm/platforms/omap5.h:2: note: '__ASM_ASM_PLATFORMS_OMAP5_H' is defined here; did you mean '__ASM_ARM_PLATFORMS_OMAP5_H'?
+
+It is unclear whether this is on purpose or not, but for our limited
+set of permuations, we change them to match and no issues have been
+found.
+
+Upstream-Status: Pending [the xen folks understand the code and the right fix .. I don't]
+
+Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
+---
+ xen/arch/arm/include/asm/platforms/midway.h | 2 +-
+ xen/arch/arm/include/asm/platforms/omap5.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/xen/arch/arm/include/asm/platforms/midway.h b/xen/arch/arm/include/asm/platforms/midway.h
+index 099e4350f9..69143931c2 100644
+--- a/xen/arch/arm/include/asm/platforms/midway.h
++++ b/xen/arch/arm/include/asm/platforms/midway.h
+@@ -1,5 +1,5 @@
+ #ifndef __ASM_ARM_PLATFORMS_MIDWAY_H
+-#define __ASM_ASM_PLATFORMS_MIDWAY_H
++#define __ASM_ARM_PLATFORMS_MIDWAY_H
+ 
+ /* addresses of SREG registers for resetting the SoC */
+ #define MW_SREG_PWR_REQ             0xfff3cf00
+diff --git a/xen/arch/arm/include/asm/platforms/omap5.h b/xen/arch/arm/include/asm/platforms/omap5.h
+index c559c84b61..8867b4589a 100644
+--- a/xen/arch/arm/include/asm/platforms/omap5.h
++++ b/xen/arch/arm/include/asm/platforms/omap5.h
+@@ -1,5 +1,5 @@
+ #ifndef __ASM_ARM_PLATFORMS_OMAP5_H
+-#define __ASM_ASM_PLATFORMS_OMAP5_H
++#define __ASM_ARM_PLATFORMS_OMAP5_H
+ 
+ #define REALTIME_COUNTER_BASE                   0x48243200
+ #define INCREMENTER_NUMERATOR_OFFSET            0x10
+-- 
+2.39.2
+
diff --git a/recipes-extended/xen/files/10-ether.network b/recipes-extended/xen/files/10-ether.network
new file mode 100644
index 00000000..8d27ca92
--- /dev/null
+++ b/recipes-extended/xen/files/10-ether.network
@@ -0,0 +1,5 @@
+[Match]
+Type=ether
+
+[Network]
+Bridge=xenbr0
diff --git a/recipes-extended/xen/files/10-xenbr0.netdev b/recipes-extended/xen/files/10-xenbr0.netdev
new file mode 100644
index 00000000..ec45879f
--- /dev/null
+++ b/recipes-extended/xen/files/10-xenbr0.netdev
@@ -0,0 +1,3 @@
+[NetDev]
+Name=xenbr0
+Kind=bridge
diff --git a/recipes-extended/xen/files/10-xenbr0.network b/recipes-extended/xen/files/10-xenbr0.network
new file mode 100644
index 00000000..1e10c3eb
--- /dev/null
+++ b/recipes-extended/xen/files/10-xenbr0.network
@@ -0,0 +1,5 @@
+[Match]
+Name=xenbr0
+
+[Network]
+DHCP=yes