Merge remote-tracking branch 'xilinx/rel-v2024.1' into master-next

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

1 files changed, 37 insertions, 0 deletions

diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch
new file mode 100644
index 00000000..7ff202ff
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-mapcache-Fix-build-on-Arm.patch
@@ -0,0 +1,37 @@
+From 2aca3ff63a5d5897cd32e0030569623f0c454f2c Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Mon, 19 Sep 2022 21:59:55 +0300
+Subject: [PATCH 7/8] xen-mapcache: Fix build on Arm
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+../hw/xen/xen-mapcache.c: In function ‘xen_map_grant_dyn’:
+../hw/xen/xen-mapcache.c:668:9: error: ‘refs’ may be used uninitialized
+   in this function [-Werror=maybe-uninitialized]
+  668 |         g_free(refs);
+      |         ^~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index f81b75d216..6544e331e0 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -620,7 +620,7 @@ static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
+     unsigned int i;
+     unsigned int nrefs = (page_off + *plen + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
+     uint32_t ref = (addr - XEN_GRANT_ADDR_OFF) >> XC_PAGE_SHIFT;
+-    uint32_t *refs;
++    uint32_t *refs = NULL;
+     unsigned int prot = PROT_READ;
+     struct XENMappedGrantRegion *mgr = NULL;
+ 
+-- 
+2.25.1
+