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

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

72 files changed, 8028 insertions, 0 deletions

diff --git a/meta-xilinx-virtualization/COPYING.MIT b/meta-xilinx-virtualization/COPYING.MIT
new file mode 100644
index 00000000..fb950dc6
--- /dev/null
+++ b/meta-xilinx-virtualization/COPYING.MIT
@@ -0,0 +1,17 @@
+Permission is hereby granted, free of charge, to any person obtaining a copy 
+of this software and associated documentation files (the "Software"), to deal 
+in the Software without restriction, including without limitation the rights 
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+copies of the Software, and to permit persons to whom the Software is 
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in 
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 
+THE SOFTWARE.
diff --git a/meta-xilinx-virtualization/README.md b/meta-xilinx-virtualization/README.md
new file mode 100644
index 00000000..ad6d4ada
--- /dev/null
+++ b/meta-xilinx-virtualization/README.md
@@ -0,0 +1,143 @@
+# meta-xilinx-vendor
+
+This layer enables AMD Xilinx Xen configurations and features for ZynqMP and
+Versal devices and also provides related metadata.
+
+## Xen Build Instructions
+
+The Yocto Project setup for AMD Xilinx Xen configurations workflow is as follows.
+Be sure to read everything below.
+
+1. Follow [Building Instructions](../README.building.md) upto step 2.
+
+2. Clone the meta-security repository.
+
+```
+$ git clone -b <release-branch> https://git.yoctoproject.org/meta-security
+```
+
+3. Continue [Building Instructions](../README.building.md) from step 4.
+
+> **Note:**
+> * For System Device Tree(SDT) workflow see [SDT Building Instructions](../meta-xilinx-standalone-experimental/README.md)
+
+4. Add meta-xilinx-virtualization layer to bblayers.conf as shown below.
+
+```
+$ bitbake-layers add-layer ./<path-to-layer>/meta-xilinx/meta-xilinx-virtualization
+```
+
+5. The following variables needs to be added to the end of the conf/local.conf file.
+
+```
+# Xen variables
+BOOTMODE = "xen"
+ENABLE_XEN_UBOOT_SCR = "1"
+ENABLE_XEN_DTSI = "1"
+ENABLE_XEN_QEMU_DTSI = "1"
+
+DISTRO_FEATURES:append = " multiarch security tpm virtualization vmsep xen"
+
+IMAGE_FEATURES += "ssh-server-openssh"
+
+DISTRO_FEATURES:append = " systemd"
+VIRTUAL-RUNTIME_init_manager = "systemd"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "sysvinit"
+
+IMAGE_INSTALL:append = " \
+    kernel-module-xen-blkback \
+    kernel-module-xen-gntalloc \
+    kernel-module-xen-gntdev \
+    kernel-module-xen-netback \
+    kernel-module-xen-wdt \
+    xen \
+    xen-tools \
+    xen-tools-xenstat \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'vmsep', 'qemu-aarch64 qemu-keymaps', 'qemu', d)} \
+    "
+```
+
+6. Continue [Building Instructions](../README.building.md) from step 5.
+
+## Xen Boot Instructions
+
+> **Note:**
+> * This README provides instructions for Xen Dom0 only.
+
+1. Follow [Booting Instructions](../README.booting.md) upto step 2.
+
+2. Verify Xen Dom0 is up and running on QEMU or target as shown below.
+
+```
+Poky (Yocto Project Reference Distro) 4.1.4 zynqmp-generic hvc0
+
+zynqmp-generic login: root
+root@zynqmp-generic:~# xl list
+Name                                        ID   Mem VCPUs      State   Time(s)
+Domain-0                                     0  1500     1     r-----     123.5
+root@zynqmp-generic:~# xl info
+host                   : zynqmp-generic
+release                : 6.1.0-xilinx-v2024.1
+version                : #1 SMP Thu Dec 21 07:00:11 UTC 2023
+machine                : aarch64
+nr_cpus                : 4
+max_cpu_id             : 3
+nr_nodes               : 1
+cores_per_socket       : 1
+threads_per_core       : 1
+cpu_mhz                : 99.990
+hw_caps                : 00000000:00000000:00000000:00000000:00000000:00000000:00000000:00000000
+virt_caps              : hvm hvm_directio hap iommu_hap_pt_share vpmu gnttab-v1
+total_memory           : 4095
+free_memory            : 2529
+sharing_freed_memory   : 0
+sharing_used_memory    : 0
+outstanding_claims     : 0
+free_cpus              : 0
+xen_major              : 4
+xen_minor              : 17
+xen_extra              : .0
+xen_version            : 4.17.0
+xen_caps               : xen-3.0-aarch64 xen-3.0-armv7l
+xen_scheduler          : credit2
+xen_pagesize           : 4096
+platform_params        : virt_start=0x200000
+xen_changeset          : Tue Dec 12 10:08:40 2023 +0100 git:38eebc6e5c-dirty
+xen_commandline        : console=dtuart dtuart=serial0 dom0_mem=1500M dom0_max_vcpus=1 bootscrub=0 vwfi=native
+cc_compiler            : aarch64-poky-linux-gcc (GCC) 12.2.0
+cc_compile_by          : santraju
+cc_compile_domain      :
+cc_compile_date        : 2023-12-12
+build_id               : 5e2952e1dd06c52a2a09ada7476333c48d88a285
+xend_config_format     : 4
+root@zynqmp-generic:~#
+```
+
+## Dependencies
+
+This layer depends on:
+
+        URI: https://git.yoctoproject.org/poky
+        layers: meta, meta-poky
+        branch: langdale
+
+        URI: https://git.openembedded.org/meta-openembedded
+        layers: meta-oe, meta-python, meta-filesystems, meta-networking.
+        branch: langdale
+
+        URI:
+        https://git.yoctoproject.org/meta-xilinx (official version)
+        https://github.com/Xilinx/meta-xilinx (development and amd xilinx release)
+        layers: meta-xilinx-core, meta-xilinx-standalone
+        branch: langdale or amd xilinx release version (e.g. rel-v2024.1)
+
+        URI: https://git.yoctoproject.org/meta-virtualization
+        branch: langdale
+
+        URI: https://git.yoctoproject.org/meta-security
+        layers: meta-tpm
+        branch: langdale
+
+## References
+
+* https://xilinx-wiki.atlassian.net/wiki/spaces/A/pages/18842530/Xen+Hypervisor
diff --git a/meta-xilinx-virtualization/conf/layer.conf b/meta-xilinx-virtualization/conf/layer.conf
new file mode 100644
index 00000000..5e03cde4
--- /dev/null
+++ b/meta-xilinx-virtualization/conf/layer.conf
@@ -0,0 +1,27 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have packages directories, add to BBFILES
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "xilinx-virtualization"
+BBFILE_PATTERN_xilinx-virtualization = "^${LAYERDIR}/"
+BBFILE_PRIORITY_xilinx-virtualization = "5"
+
+LAYERDEPENDS_xilinx-virtualization = "\
+    xilinx \
+    virtualization-layer \
+    security \
+    tpm-layer \
+    "
+
+LAYERSERIES_COMPAT_xilinx-virtualization = "scarthgap"
+
+XILINX_XEN_VERSION[v2022.1] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2022.2] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2023.1] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2023.2] = "4.17-xilinx+git%"
+XILINX_XEN_VERSION[v2024.1] = "4.18-xilinx+git%"
+PREFERRED_VERSION_xen ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
+PREFERRED_VERSION_xen-tools ?= "${@d.getVarFlag('XILINX_XEN_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-system-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc
new file mode 100644
index 00000000..a582b035
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-tpm.inc
@@ -0,0 +1,4 @@
+PACKAGECONFIG:append = "${@bb.utils.contains('DISTRO_FEATURES', 'tpm', ' tpm', '', d)}"
+
+PACKAGECONFIG[tpm] = "--enable-tpm,--disable-tpm,,swtpm libtpm"
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
new file mode 100644
index 00000000..1210a3de
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
@@ -0,0 +1,33 @@
+# Xen-4.17 specific changes are only applicable on the target
+SRC_URI_XEN = ""
+SRC_URI_XEN:class-target = " \
+          file://0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch \
+          file://0001-xen_common-return-error-from-xen_create_ioreq_server.patch \
+          file://0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch \
+          file://0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch \
+          file://0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch \
+          file://0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch \
+          file://0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch \
+          file://0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch \
+          file://0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch \
+          file://0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch \
+          file://0010-hw-arm-introduce-xenpv-machine.patch \
+          file://0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch \
+          file://0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch \
+          file://0013-arm-xenpv-fix-TPM-address-print-warning.patch \
+          file://0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch \
+          file://0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch \
+          file://0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch \
+          file://0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch \
+          file://0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch \
+          file://0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch \
+          file://0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch \
+          file://0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch \
+          file://0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch \
+          file://0007-xen-mapcache-Fix-build-on-Arm.patch \
+          file://0008-hw-arm-Add-grant-mapping.patch \
+          "
+
+FILESEXTRAPATHS:prepend:class-target := "${THISDIR}/qemu-xilinx-7.1:"
+
+SRC_URI .= "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${SRC_URI_XEN}', '', d)}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc
new file mode 100644
index 00000000..c674dc1a
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_8.1.inc
@@ -0,0 +1,20 @@
+# Xen-4.18 specific changes are only applicable on the target
+SRC_URI_XEN = ""
+SRC_URI_XEN:class-target = " \
+    file://0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch \
+    file://0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch \
+    file://0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch \
+    file://0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch \
+    file://0005-softmmu-physmem-Split-ram_block_add.patch \
+    file://0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch \
+    file://0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch \
+    file://0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch \
+    file://0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch \
+    file://0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch \
+    file://0011-hw-arm-Add-grant-mapping.patch \
+    file://0001-arm-xenpvh-Introduce-virtio-pci-support.patch \
+    "
+
+FILESEXTRAPATHS:prepend:class-target := "${THISDIR}/qemu-xilinx-8.1:"
+
+SRC_URI .= "${@bb.utils.contains('DISTRO_FEATURES', 'xen', '${SRC_URI_XEN}', '', d)}"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch
new file mode 100644
index 00000000..99eaeeaf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-pt-fix-syntax-error-that-causes-FTBFS-in-some-co.patch
@@ -0,0 +1,40 @@
+From ba24456b93a205b728475d5f0880f3ec495e383a Mon Sep 17 00:00:00 2001
+From: Chuck Zmudzinski <brchuckz@aol.com>
+Date: Mon, 31 Oct 2022 17:35:52 -0400
+Subject: [PATCH] xen/pt: fix syntax error that causes FTBFS in some
+ configurations
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+When Qemu is built with --enable-xen and --disable-xen-pci-passthrough
+and the target os is linux, the build fails with:
+
+meson.build:3477:2: ERROR: File xen_pt_stub.c does not exist.
+
+Fixes: 582ea95f5f93 ("meson: convert hw/xen")
+
+Signed-off-by: Chuck Zmudzinski <brchuckz@aol.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
+Message-Id: <5f1342a13c09af77b1a7b0aeaba5955bcea89731.1667242033.git.brchuckz@aol.com>
+Signed-off-by: Laurent Vivier <laurent@vivier.eu>
+---
+ hw/xen/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index 08dc1f6857..ae0ace3046 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -18,7 +18,7 @@ if have_xen_pci_passthrough
+     'xen_pt_msi.c',
+   ))
+ else
+-  xen_specific_ss.add('xen_pt_stub.c')
++  xen_specific_ss.add(files('xen_pt_stub.c'))
+ endif
+ 
+ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
+-- 
+2.17.0
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
new file mode 100644
index 00000000..71dfb3be
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
@@ -0,0 +1,51 @@
+From e2b85efc82bc26a838f666c8282528ee38cf6377 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Tue, 16 Mar 2021 14:00:33 +0100
+Subject: [PATCH 1/8] xen: when unplugging emulated devices skip virtio devices
+
+Virtio devices should never be unplugged at boot time, as they are
+similar to pci passthrough devices.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/i386/xen/xen_platform.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
+index a64265cca0..39bbb12675 100644
+--- a/hw/i386/xen/xen_platform.c
++++ b/hw/i386/xen/xen_platform.c
+@@ -30,6 +30,7 @@
+ #include "hw/pci/pci.h"
+ #include "hw/xen/xen_common.h"
+ #include "migration/vmstate.h"
++#include "hw/virtio/virtio-bus.h"
+ #include "hw/xen/xen-legacy-backend.h"
+ #include "trace.h"
+ #include "sysemu/xen.h"
+@@ -114,7 +115,8 @@ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
+     /* We have to ignore passthrough devices */
+     if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
+             PCI_CLASS_NETWORK_ETHERNET
+-            && strcmp(d->name, "xen-pci-passthrough") != 0) {
++            && strcmp(d->name, "xen-pci-passthrough") != 0
++            && !qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
+         object_unparent(OBJECT(d));
+     }
+ }
+@@ -191,6 +193,11 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *opaque)
+         return;
+     }
+ 
++    /* Ignore virtio devices */
++    if (qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
++        return;
++    }
++
+     switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
+     case PCI_CLASS_STORAGE_IDE:
+         pci_xen_ide_unplug(DEVICE(d), aux);
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch
new file mode 100644
index 00000000..d4349b1d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0001-xen_common-return-error-from-xen_create_ioreq_server.patch
@@ -0,0 +1,55 @@
+From ef4d512aff004c62d550cdd64329c6c1acd0f217 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:48:03 -0700
+Subject: [PATCH 01/16] xen_common: return error from xen_create_ioreq_server
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ include/hw/xen/xen_common.h | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
+index 77ce17d8a4..c2d2f36bde 100644
+--- a/include/hw/xen/xen_common.h
++++ b/include/hw/xen/xen_common.h
+@@ -467,8 +467,8 @@ static inline void xen_unmap_pcidev(domid_t dom,
+ {
+ }
+ 
+-static inline void xen_create_ioreq_server(domid_t dom,
+-                                           ioservid_t *ioservid)
++static inline int xen_create_ioreq_server(domid_t dom,
++                                          ioservid_t *ioservid)
+ {
+ }
+ 
+@@ -600,8 +600,8 @@ static inline void xen_unmap_pcidev(domid_t dom,
+                                                   PCI_FUNC(pci_dev->devfn));
+ }
+ 
+-static inline void xen_create_ioreq_server(domid_t dom,
+-                                           ioservid_t *ioservid)
++static inline int xen_create_ioreq_server(domid_t dom,
++                                          ioservid_t *ioservid)
+ {
+     int rc = xendevicemodel_create_ioreq_server(xen_dmod, dom,
+                                                 HVM_IOREQSRV_BUFIOREQ_ATOMIC,
+@@ -609,12 +609,14 @@ static inline void xen_create_ioreq_server(domid_t dom,
+ 
+     if (rc == 0) {
+         trace_xen_ioreq_server_create(*ioservid);
+-        return;
++        return rc;
+     }
+ 
+     *ioservid = 0;
+     use_default_ioreq_server = true;
+     trace_xen_default_ioreq_server();
++
++    return rc;
+ }
+ 
+ static inline void xen_destroy_ioreq_server(domid_t dom,
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch
new file mode 100644
index 00000000..8facb189
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-add-pseudo-RAM-region-for-grant-mappings.patch
@@ -0,0 +1,252 @@
+From e18daac2f6d3f60c8217f44189a91cf8240a591f Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:19:58 +0200
+Subject: [PATCH 2/8] xen: add pseudo RAM region for grant mappings
+
+Add a memory region which can be used to automatically map granted
+memory. It is starting at 0x8000000000000000ULL in order to be able to
+distinguish it from normal RAM.
+
+For this reason the xen.ram memory region is expanded, which has no
+further impact as it is used just as a container of the real RAM
+regions and now the grant region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/i386/xen/xen-hvm.c           |  3 ++
+ hw/xen/xen-hvm-common.c         |  4 +--
+ hw/xen/xen-mapcache.c           | 28 +++++++++++++++
+ include/exec/ram_addr.h         |  1 +
+ include/hw/xen/xen-hvm-common.h |  2 ++
+ include/hw/xen/xen_pvdev.h      |  3 ++
+ include/sysemu/xen-mapcache.h   |  3 ++
+ softmmu/physmem.c               | 61 ++++++++++++++++++++-------------
+ 8 files changed, 80 insertions(+), 25 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 36d87555a9..2dcc2e1179 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -171,6 +171,9 @@ static void xen_ram_init(PCMachineState *pcms,
+                                  x86ms->above_4g_mem_size);
+         memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);
+     }
++
++    /* Add grant mappings as a pseudo RAM region. */
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 7e7d23397f..abd6e379d3 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -10,7 +10,7 @@
+ #include "hw/boards.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-MemoryRegion ram_memory;
++MemoryRegion ram_memory, ram_grants;
+ 
+ MemoryListener xen_io_listener = {
+     .name = "xen-io",
+@@ -742,7 +742,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+         return;
+     }
+ 
+-    if (mr == &ram_memory) {
++    if (mr == &ram_memory || mr == &ram_grants) {
+         return;
+     }
+ 
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index a2f93096e7..0b75f1633a 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -14,7 +14,10 @@
+ 
+ #include <sys/resource.h>
+ 
++#include "hw/xen/xen-hvm-common.h"
+ #include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen_pvdev.h"
++
+ #include "qemu/bitmap.h"
+ 
+ #include "sysemu/runstate.h"
+@@ -597,3 +600,28 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     mapcache_unlock();
+     return p;
+ }
++
++MemoryRegion *xen_init_grant_ram(void)
++{
++    RAMBlock *block;
++
++    memory_region_init(&ram_grants, NULL, "xen.grants",
++                       XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
++    block = g_malloc0(sizeof(*block));
++    block->mr = &ram_grants;
++    block->used_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->max_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->fd = -1;
++    block->page_size = XC_PAGE_SIZE;
++    block->host = (void *)XEN_GRANT_ADDR_OFF;
++    block->offset = XEN_GRANT_ADDR_OFF;
++    block->flags = RAM_PREALLOC;
++    ram_grants.ram_block = block;
++    ram_grants.ram = true;
++    ram_grants.terminates = true;
++    ram_block_add_list(block);
++    memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
++                                &ram_grants);
++
++    return &ram_grants;
++}
+diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
+index f3e0c78161..e60b055867 100644
+--- a/include/exec/ram_addr.h
++++ b/include/exec/ram_addr.h
+@@ -137,6 +137,7 @@ void qemu_ram_free(RAMBlock *block);
+ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+ 
+ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
++void ram_block_add_list(RAMBlock *new_block);
+ 
+ /* Clear whole block of mem */
+ static inline void qemu_ram_block_writeback(RAMBlock *block)
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+index 2979f84ee2..6f7cc05d38 100644
+--- a/include/hw/xen/xen-hvm-common.h
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -16,6 +16,8 @@
+ #include <xen/hvm/ioreq.h>
+ 
+ extern MemoryRegion ram_memory;
++
++extern MemoryRegion ram_grants;
+ extern MemoryListener xen_io_listener;
+ extern DeviceListener xen_device_listener;
+ 
+diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
+index 7cd4bc2b82..36cd3ec1d4 100644
+--- a/include/hw/xen/xen_pvdev.h
++++ b/include/hw/xen/xen_pvdev.h
+@@ -78,4 +78,7 @@ int xen_pv_send_notify(struct XenLegacyDevice *xendev);
+ void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
+                    const char *fmt, ...)  G_GNUC_PRINTF(3, 4);
+ 
++#define XEN_GRANT_ADDR_OFF    0x8000000000000000ULL
++#define XEN_MAX_VIRTIO_GRANTS 65536
++
+ #endif /* QEMU_HW_XEN_PVDEV_H */
+diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
+index c8e7c2f6cf..f4bedb1c11 100644
+--- a/include/sysemu/xen-mapcache.h
++++ b/include/sysemu/xen-mapcache.h
+@@ -10,6 +10,7 @@
+ #define XEN_MAPCACHE_H
+ 
+ #include "exec/cpu-common.h"
++#include "exec/ram_addr.h"
+ 
+ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset,
+                                          ram_addr_t size);
+@@ -25,6 +26,8 @@ void xen_invalidate_map_cache(void);
+ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+                                  hwaddr new_phys_addr,
+                                  hwaddr size);
++MemoryRegion *xen_init_grant_ram(void);
++
+ #else
+ 
+ static inline void xen_map_cache_init(phys_offset_to_gaddr_t f,
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index dc3c3e5f2e..63ba5f7495 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -1971,12 +1971,46 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
+     }
+ }
+ 
++static void ram_block_add_list_locked(RAMBlock *new_block)
++ {
++     RAMBlock *block;
++     RAMBlock *last_block = NULL;
++
++    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
++     * QLIST (which has an RCU-friendly variant) does not have insertion at
++     * tail, so save the last element in last_block.
++     */
++    RAMBLOCK_FOREACH(block) {
++        last_block = block;
++        if (block->max_length < new_block->max_length) {
++            break;
++        }
++    }
++    if (block) {
++        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
++    } else if (last_block) {
++        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
++    } else { /* list is empty */
++        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
++    }
++    ram_list.mru_block = NULL;
++
++    /* Write list before version */
++    smp_wmb();
++    ram_list.version++;
++}
++
++void ram_block_add_list(RAMBlock *new_block)
++{
++    qemu_mutex_lock_ramlist();
++    ram_block_add_list_locked(new_block);
++    qemu_mutex_unlock_ramlist();
++}
++
+ static void ram_block_add(RAMBlock *new_block, Error **errp)
+ {
+     const bool noreserve = qemu_ram_is_noreserve(new_block);
+     const bool shared = qemu_ram_is_shared(new_block);
+-    RAMBlock *block;
+-    RAMBlock *last_block = NULL;
+     ram_addr_t old_ram_size, new_ram_size;
+     Error *err = NULL;
+ 
+@@ -2014,28 +2048,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
+     if (new_ram_size > old_ram_size) {
+         dirty_memory_extend(old_ram_size, new_ram_size);
+     }
+-    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
+-     * QLIST (which has an RCU-friendly variant) does not have insertion at
+-     * tail, so save the last element in last_block.
+-     */
+-    RAMBLOCK_FOREACH(block) {
+-        last_block = block;
+-        if (block->max_length < new_block->max_length) {
+-            break;
+-        }
+-    }
+-    if (block) {
+-        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
+-    } else if (last_block) {
+-        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
+-    } else { /* list is empty */
+-        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
+-    }
+-    ram_list.mru_block = NULL;
+ 
+-    /* Write list before version */
+-    smp_wmb();
+-    ram_list.version++;
++    ram_block_add_list_locked(new_block);
++
+     qemu_mutex_unlock_ramlist();
+ 
+     cpu_physical_memory_set_dirty_range(new_block->offset,
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch
new file mode 100644
index 00000000..35ca6df4
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch
@@ -0,0 +1,88 @@
+From 423468bdb3728154e95af18ef755bc75c5d59a3a Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Thu, 30 Jun 2022 18:19:50 -0700
+Subject: [PATCH 02/16] xen-mapcache: move xen-mapcache.c to hw/xen
+
+xen-mapcache.c contains common functions which are useful for Xen on ARM
+IOREQ handling. Moving it out of i386 to hw/xen for commong access.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/meson.build              | 1 +
+ hw/i386/xen/meson.build          | 1 -
+ hw/i386/xen/trace-events         | 5 -----
+ hw/xen/meson.build               | 4 ++++
+ hw/xen/trace-events              | 5 +++++
+ hw/{i386 => }/xen/xen-mapcache.c | 0
+ 6 files changed, 10 insertions(+), 6 deletions(-)
+ rename hw/{i386 => }/xen/xen-mapcache.c (100%)
+
+diff --git a/hw/i386/meson.build b/hw/i386/meson.build
+index 213e2e82b3..cfdbfdcbcb 100644
+--- a/hw/i386/meson.build
++++ b/hw/i386/meson.build
+@@ -33,5 +33,6 @@ subdir('kvm')
+ subdir('xen')
+ 
+ i386_ss.add_all(xenpv_ss)
++i386_ss.add_all(xen_ss)
+ 
+ hw_arch += {'i386': i386_ss}
+diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build
+index be84130300..2fcc46e6ca 100644
+--- a/hw/i386/xen/meson.build
++++ b/hw/i386/xen/meson.build
+@@ -1,6 +1,5 @@
+ i386_ss.add(when: 'CONFIG_XEN', if_true: files(
+   'xen-hvm.c',
+-  'xen-mapcache.c',
+   'xen_apic.c',
+   'xen_platform.c',
+   'xen_pvdevice.c',
+diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events
+index 5d6be61090..a0c89d91c4 100644
+--- a/hw/i386/xen/trace-events
++++ b/hw/i386/xen/trace-events
+@@ -21,8 +21,3 @@ xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
+ cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+ cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+ 
+-# xen-mapcache.c
+-xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
+-xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
+-xen_map_cache_return(void* ptr) "%p"
+-
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index ae0ace3046..19d0637c46 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -22,3 +22,7 @@ else
+ endif
+ 
+ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
++
++xen_ss = ss.source_set()
++
++xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
+diff --git a/hw/xen/trace-events b/hw/xen/trace-events
+index 3da3fd8348..2c8f238f42 100644
+--- a/hw/xen/trace-events
++++ b/hw/xen/trace-events
+@@ -41,3 +41,8 @@ xs_node_vprintf(char *path, char *value) "%s %s"
+ xs_node_vscanf(char *path, char *value) "%s %s"
+ xs_node_watch(char *path) "%s"
+ xs_node_unwatch(char *path) "%s"
++
++# xen-mapcache.c
++xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
++xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
++xen_map_cache_return(void* ptr) "%p"
+diff --git a/hw/i386/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+similarity index 100%
+rename from hw/i386/xen/xen-mapcache.c
+rename to hw/xen/xen-mapcache.c
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch
new file mode 100644
index 00000000..1113cf39
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-hw-i386-xen-rearrange-xen_hvm_init_pc.patch
@@ -0,0 +1,106 @@
+From 4472924c800e9dbf46e4c2432565d3e406b35d27 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 16:32:33 -0700
+Subject: [PATCH 03/16] hw/i386/xen: rearrange xen_hvm_init_pc
+
+Move references to:
+- xen_get_vmport_regs_pfn
+- xen_suspend_notifier
+- xen_wakeup_notifier
+- xen_ram_init
+
+towards the end of the function. This is done to keep the the common
+ioreq functions in one place which will be moved to new function in next
+patch in order to make it useful to ARM machines also.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c | 49 ++++++++++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index e4293d6d66..b27484ad22 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -1416,12 +1416,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     state->exit.notify = xen_exit_notifier;
+     qemu_add_exit_notifier(&state->exit);
+ 
+-    state->suspend.notify = xen_suspend_notifier;
+-    qemu_register_suspend_notifier(&state->suspend);
+-
+-    state->wakeup.notify = xen_wakeup_notifier;
+-    qemu_register_wakeup_notifier(&state->wakeup);
+-
+     /*
+      * Register wake-up support in QMP query-current-machine API
+      */
+@@ -1432,23 +1426,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+         goto err;
+     }
+ 
+-    rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
+-    if (!rc) {
+-        DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
+-        state->shared_vmport_page =
+-            xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
+-                                 1, &ioreq_pfn, NULL);
+-        if (state->shared_vmport_page == NULL) {
+-            error_report("map shared vmport IO page returned error %d handle=%p",
+-                         errno, xen_xc);
+-            goto err;
+-        }
+-    } else if (rc != -ENOSYS) {
+-        error_report("get vmport regs pfn returned error %d, rc=%d",
+-                     errno, rc);
+-        goto err;
+-    }
+-
+     /* Note: cpus is empty at this point in init */
+     state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
+ 
+@@ -1486,7 +1463,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ #else
+     xen_map_cache_init(NULL, state);
+ #endif
+-    xen_ram_init(pcms, ms->ram_size, ram_memory);
+ 
+     qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+ 
+@@ -1513,6 +1489,31 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+ 
++    state->suspend.notify = xen_suspend_notifier;
++    qemu_register_suspend_notifier(&state->suspend);
++
++    state->wakeup.notify = xen_wakeup_notifier;
++    qemu_register_wakeup_notifier(&state->wakeup);
++
++    rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
++    if (!rc) {
++        DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
++        state->shared_vmport_page =
++            xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
++                                 1, &ioreq_pfn, NULL);
++        if (state->shared_vmport_page == NULL) {
++            error_report("map shared vmport IO page returned error %d handle=%p",
++                         errno, xen_xc);
++            goto err;
++        }
++    } else if (rc != -ENOSYS) {
++        error_report("get vmport regs pfn returned error %d, rc=%d",
++                     errno, rc);
++        goto err;
++    }
++
++    xen_ram_init(pcms, ms->ram_size, ram_memory);
++
+     /* Disable ACPI build because Xen handles it */
+     pcms->acpi_build_enabled = false;
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
new file mode 100644
index 00000000..bff815bc
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0003-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
@@ -0,0 +1,113 @@
+From cb4be1f7185c5974523c764f3f6efe3af6633d71 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:54:48 +0200
+Subject: [PATCH 3/8] softmmu: let qemu_map_ram_ptr() use qemu_ram_ptr_length()
+
+qemu_map_ram_ptr() and qemu_ram_ptr_length() share quite some code, so
+modify qemu_ram_ptr_length() a little bit and use it for
+qemu_map_ram_ptr(), too.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ softmmu/physmem.c | 56 ++++++++++++++++++-----------------------------
+ 1 file changed, 21 insertions(+), 35 deletions(-)
+
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 63ba5f7495..439a53a1be 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2306,38 +2306,7 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
+ }
+ #endif /* !_WIN32 */
+ 
+-/* Return a host pointer to ram allocated with qemu_ram_alloc.
+- * This should not be used for general purpose DMA.  Use address_space_map
+- * or address_space_rw instead. For local memory (e.g. video ram) that the
+- * device owns, use memory_region_get_ram_ptr.
+- *
+- * Called within RCU critical section.
+- */
+-void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
+-{
+-    RAMBlock *block = ram_block;
+-
+-    if (block == NULL) {
+-        block = qemu_get_ram_block(addr);
+-        addr -= block->offset;
+-    }
+-
+-    if (xen_enabled() && block->host == NULL) {
+-        /* We need to check if the requested address is in the RAM
+-         * because we don't want to map the entire memory in QEMU.
+-         * In that case just map until the end of the page.
+-         */
+-        if (block->offset == 0) {
+-            return xen_map_cache(addr, 0, 0, false);
+-        }
+-
+-        block->host = xen_map_cache(block->offset, block->max_length, 1, false);
+-    }
+-    return ramblock_ptr(block, addr);
+-}
+-
+-/* Return a host pointer to guest's ram. Similar to qemu_map_ram_ptr
+- * but takes a size argument.
++/* Return a host pointer to guest's ram.
+  *
+  * Called within RCU critical section.
+  */
+@@ -2345,7 +2314,9 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+                                  hwaddr *size, bool lock)
+ {
+     RAMBlock *block = ram_block;
+-    if (*size == 0) {
++    hwaddr len = 0;
++
++    if (size && *size == 0) {
+         return NULL;
+     }
+ 
+@@ -2353,7 +2324,10 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+         block = qemu_get_ram_block(addr);
+         addr -= block->offset;
+     }
+-    *size = MIN(*size, block->max_length - addr);
++    if (size) {
++        *size = MIN(*size, block->max_length - addr);
++        len = *size;
++    }
+ 
+     if (xen_enabled() && block->host == NULL) {
+         /* We need to check if the requested address is in the RAM
+@@ -2361,7 +2335,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+          * In that case just map the requested area.
+          */
+         if (block->offset == 0) {
+-            return xen_map_cache(addr, *size, lock, lock);
++            return xen_map_cache(addr, len, lock, lock);
+         }
+ 
+         block->host = xen_map_cache(block->offset, block->max_length, 1, lock);
+@@ -2370,6 +2344,18 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+     return ramblock_ptr(block, addr);
+ }
+ 
++/* Return a host pointer to ram allocated with qemu_ram_alloc.
++ * This should not be used for general purpose DMA.  Use address_space_map
++ * or address_space_rw instead. For local memory (e.g. video ram) that the
++ * device owns, use memory_region_get_ram_ptr.
++ *
++ * Called within RCU critical section.
++ */
++void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
++{
++    return qemu_ram_ptr_length(ram_block, addr, NULL, false);
++}
++
+ /* Return the offset of a hostpointer within a ramblock */
+ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)
+ {
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch
new file mode 100644
index 00000000..4337e0c8
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-hvm-move-x86-specific-fields-out-of-XenIOState.patch
@@ -0,0 +1,180 @@
+From 2a01fa06d267f68148d3a6df50675edfe090601a Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:16:52 -0700
+Subject: [PATCH 04/16] xen-hvm: move x86-specific fields out of XenIOState
+
+Move:
+- shared_vmport_page
+- log_for_dirtybit
+- dirty_bitmap
+- suspend
+- wakeup
+
+out of XenIOState as they are only used on x86, especially the ones
+related to dirty logging.
+
+Remove free_phys_offset that was unused.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c | 58 ++++++++++++++++++++-----------------------
+ 1 file changed, 27 insertions(+), 31 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index b27484ad22..225cfdf8b7 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -73,6 +73,7 @@ struct shared_vmport_iopage {
+ };
+ typedef struct shared_vmport_iopage shared_vmport_iopage_t;
+ #endif
++static shared_vmport_iopage_t *shared_vmport_page;
+ 
+ static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
+ {
+@@ -95,6 +96,11 @@ typedef struct XenPhysmap {
+ } XenPhysmap;
+ 
+ static QLIST_HEAD(, XenPhysmap) xen_physmap;
++static const XenPhysmap *log_for_dirtybit = NULL;
++/* Buffer used by xen_sync_dirty_bitmap */
++static unsigned long *dirty_bitmap = NULL;
++static Notifier suspend;
++static Notifier wakeup;
+ 
+ typedef struct XenPciDevice {
+     PCIDevice *pci_dev;
+@@ -105,7 +111,6 @@ typedef struct XenPciDevice {
+ typedef struct XenIOState {
+     ioservid_t ioservid;
+     shared_iopage_t *shared_page;
+-    shared_vmport_iopage_t *shared_vmport_page;
+     buffered_iopage_t *buffered_io_page;
+     xenforeignmemory_resource_handle *fres;
+     QEMUTimer *buffered_io_timer;
+@@ -125,14 +130,8 @@ typedef struct XenIOState {
+     MemoryListener io_listener;
+     QLIST_HEAD(, XenPciDevice) dev_list;
+     DeviceListener device_listener;
+-    hwaddr free_phys_offset;
+-    const XenPhysmap *log_for_dirtybit;
+-    /* Buffer used by xen_sync_dirty_bitmap */
+-    unsigned long *dirty_bitmap;
+ 
+     Notifier exit;
+-    Notifier suspend;
+-    Notifier wakeup;
+ } XenIOState;
+ 
+ /* Xen specific function for piix pci */
+@@ -462,10 +461,10 @@ static int xen_remove_from_physmap(XenIOState *state,
+     }
+ 
+     QLIST_REMOVE(physmap, list);
+-    if (state->log_for_dirtybit == physmap) {
+-        state->log_for_dirtybit = NULL;
+-        g_free(state->dirty_bitmap);
+-        state->dirty_bitmap = NULL;
++    if (log_for_dirtybit == physmap) {
++        log_for_dirtybit = NULL;
++        g_free(dirty_bitmap);
++        dirty_bitmap = NULL;
+     }
+     g_free(physmap);
+ 
+@@ -626,16 +625,16 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
+         return;
+     }
+ 
+-    if (state->log_for_dirtybit == NULL) {
+-        state->log_for_dirtybit = physmap;
+-        state->dirty_bitmap = g_new(unsigned long, bitmap_size);
+-    } else if (state->log_for_dirtybit != physmap) {
++    if (log_for_dirtybit == NULL) {
++        log_for_dirtybit = physmap;
++        dirty_bitmap = g_new(unsigned long, bitmap_size);
++    } else if (log_for_dirtybit != physmap) {
+         /* Only one range for dirty bitmap can be tracked. */
+         return;
+     }
+ 
+     rc = xen_track_dirty_vram(xen_domid, start_addr >> TARGET_PAGE_BITS,
+-                              npages, state->dirty_bitmap);
++                              npages, dirty_bitmap);
+     if (rc < 0) {
+ #ifndef ENODATA
+ #define ENODATA  ENOENT
+@@ -650,7 +649,7 @@ static void xen_sync_dirty_bitmap(XenIOState *state,
+     }
+ 
+     for (i = 0; i < bitmap_size; i++) {
+-        unsigned long map = state->dirty_bitmap[i];
++        unsigned long map = dirty_bitmap[i];
+         while (map != 0) {
+             j = ctzl(map);
+             map &= ~(1ul << j);
+@@ -676,12 +675,10 @@ static void xen_log_start(MemoryListener *listener,
+ static void xen_log_stop(MemoryListener *listener, MemoryRegionSection *section,
+                          int old, int new)
+ {
+-    XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-
+     if (old & ~new & (1 << DIRTY_MEMORY_VGA)) {
+-        state->log_for_dirtybit = NULL;
+-        g_free(state->dirty_bitmap);
+-        state->dirty_bitmap = NULL;
++        log_for_dirtybit = NULL;
++        g_free(dirty_bitmap);
++        dirty_bitmap = NULL;
+         /* Disable dirty bit tracking */
+         xen_track_dirty_vram(xen_domid, 0, 0, NULL);
+     }
+@@ -1021,9 +1018,9 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     vmware_regs_t *vmport_regs;
+ 
+-    assert(state->shared_vmport_page);
++    assert(shared_vmport_page);
+     vmport_regs =
+-        &state->shared_vmport_page->vcpu_vmport_regs[state->send_vcpu];
++        &shared_vmport_page->vcpu_vmport_regs[state->send_vcpu];
+     QEMU_BUILD_BUG_ON(sizeof(*req) < sizeof(*vmport_regs));
+ 
+     current_cpu = state->cpu_by_vcpu_id[state->send_vcpu];
+@@ -1468,7 +1465,6 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ 
+     state->memory_listener = xen_memory_listener;
+     memory_listener_register(&state->memory_listener, &address_space_memory);
+-    state->log_for_dirtybit = NULL;
+ 
+     state->io_listener = xen_io_listener;
+     memory_listener_register(&state->io_listener, &address_space_io);
+@@ -1489,19 +1485,19 @@ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+ 
+-    state->suspend.notify = xen_suspend_notifier;
+-    qemu_register_suspend_notifier(&state->suspend);
++    suspend.notify = xen_suspend_notifier;
++    qemu_register_suspend_notifier(&suspend);
+ 
+-    state->wakeup.notify = xen_wakeup_notifier;
+-    qemu_register_wakeup_notifier(&state->wakeup);
++    wakeup.notify = xen_wakeup_notifier;
++    qemu_register_wakeup_notifier(&wakeup);
+ 
+     rc = xen_get_vmport_regs_pfn(xen_xc, xen_domid, &ioreq_pfn);
+     if (!rc) {
+         DPRINTF("shared vmport page at pfn %lx\n", ioreq_pfn);
+-        state->shared_vmport_page =
++        shared_vmport_page =
+             xenforeignmemory_map(xen_fmem, xen_domid, PROT_READ|PROT_WRITE,
+                                  1, &ioreq_pfn, NULL);
+-        if (state->shared_vmport_page == NULL) {
++        if (shared_vmport_page == NULL) {
+             error_report("map shared vmport IO page returned error %d handle=%p",
+                          errno, xen_xc);
+             goto err;
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
new file mode 100644
index 00000000..25dc0ae0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0004-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
@@ -0,0 +1,49 @@
+From 7dfa8828bd2e61fc5bf2bf6294aad16b2bf4ff8a Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 13:31:32 +0200
+Subject: [PATCH 4/8] xen: let xen_ram_addr_from_mapcache() return -1 in case
+ of not found entry
+
+Today xen_ram_addr_from_mapcache() will either abort() or return 0 in
+case it can't find a matching entry for a pointer value. Both cases
+are bad, so change that to return an invalid address instead.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 0b75f1633a..e53e7221f1 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -405,13 +405,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         }
+     }
+     if (!found) {
+-        fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
+-        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+-            DPRINTF("   "TARGET_FMT_plx" -> %p is present\n", reventry->paddr_index,
+-                    reventry->vaddr_req);
+-        }
+-        abort();
+-        return 0;
++        mapcache_unlock();
++        return RAM_ADDR_INVALID;
+     }
+ 
+     entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
+@@ -419,8 +414,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         entry = entry->next;
+     }
+     if (!entry) {
+-        DPRINTF("Trying to find address %p that is not in the mapcache!\n", ptr);
+-        raddr = 0;
++        raddr = RAM_ADDR_INVALID;
+     } else {
+         raddr = (reventry->paddr_index << MCACHE_BUCKET_SHIFT) +
+              ((unsigned long) ptr - (unsigned long) entry->vaddr_base);
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
new file mode 100644
index 00000000..db6d8fe5
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
@@ -0,0 +1,150 @@
+From bd32a130ca633eae7cf0f4ff0fa856004d413df0 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 27 May 2021 15:27:55 +0200
+Subject: [PATCH 5/8] memory: add MemoryRegion map and unmap callbacks
+
+In order to support mapping and unmapping guest memory dynamically to
+and from qemu during address_space_[un]map() operations add the map()
+and unmap() callbacks to MemoryRegionOps.
+
+Those will be used e.g. for Xen grant mappings when performing guest
+I/Os.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ include/exec/memory.h | 19 +++++++++++++++++
+ softmmu/physmem.c     | 47 +++++++++++++++++++++++++++++++++----------
+ 2 files changed, 55 insertions(+), 11 deletions(-)
+
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index bfb1de8eea..19e2aac694 100644
+--- a/include/exec/memory.h
++++ b/include/exec/memory.h
+@@ -245,6 +245,25 @@ struct MemoryRegionOps {
+                                     unsigned size,
+                                     MemTxAttrs attrs);
+ 
++    /* Dynamically create mapping. @addr is the guest address to map; @plen
++     * is the pointer to the usable length of the buffer.
++     * @mr contents can be changed in case a new memory region is created for
++     * the mapping.
++     * Returns the buffer address for accessing the data. */
++    void *(*map)(MemoryRegion **mr,
++                 hwaddr addr,
++                 hwaddr *plen,
++                 bool is_write,
++                 MemTxAttrs attrs);
++
++    /* Unmap an area obtained via map() before. */
++    void (*unmap)(MemoryRegion *mr,
++                  void *buffer,
++                  ram_addr_t addr,
++                  hwaddr len,
++                  bool is_write,
++                  hwaddr access_len);
++
+     enum device_endian endianness;
+     /* Guest-visible constraints: */
+     struct {
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 439a53a1be..2038240311 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -3237,7 +3237,7 @@ void *address_space_map(AddressSpace *as,
+     hwaddr len = *plen;
+     hwaddr l, xlat;
+     MemoryRegion *mr;
+-    void *ptr;
++    void *ptr = NULL;
+     FlatView *fv;
+ 
+     if (len == 0) {
+@@ -3273,10 +3273,17 @@ void *address_space_map(AddressSpace *as,
+ 
+ 
+     memory_region_ref(mr);
++
++    if (mr->ops && mr->ops->map) {
++        ptr = mr->ops->map(&mr, addr, plen, is_write, attrs);
++    }
++
+     *plen = flatview_extend_translation(fv, addr, len, mr, xlat,
+                                         l, is_write, attrs);
+     fuzz_dma_read_cb(addr, *plen, mr);
+-    ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    if (ptr == NULL) {
++        ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    }
+ 
+     return ptr;
+ }
+@@ -3294,11 +3301,16 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
+ 
+         mr = memory_region_from_host(buffer, &addr1);
+         assert(mr != NULL);
+-        if (is_write) {
+-            invalidate_and_set_dirty(mr, addr1, access_len);
+-        }
+-        if (xen_enabled()) {
+-            xen_invalidate_map_cache_entry(buffer);
++
++        if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, buffer, addr1, len, is_write, access_len);
++        } else {
++            if (is_write) {
++                invalidate_and_set_dirty(mr, addr1, access_len);
++            }
++            if (xen_enabled()) {
++                xen_invalidate_map_cache_entry(buffer);
++            }
+         }
+         memory_region_unref(mr);
+         return;
+@@ -3370,10 +3382,17 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
+          * doing this if we found actual RAM, which behaves the same
+          * regardless of attributes; so UNSPECIFIED is fine.
+          */
++        if (mr->ops && mr->ops->map) {
++            cache->ptr = mr->ops->map(&mr, addr, &l, is_write,
++                                      MEMTXATTRS_UNSPECIFIED);
++        }
++
+         l = flatview_extend_translation(cache->fv, addr, len, mr,
+                                         cache->xlat, l, is_write,
+                                         MEMTXATTRS_UNSPECIFIED);
+-        cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        if (!cache->ptr) {
++            cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        }
+     } else {
+         cache->ptr = NULL;
+     }
+@@ -3395,14 +3414,20 @@ void address_space_cache_invalidate(MemoryRegionCache *cache,
+ 
+ void address_space_cache_destroy(MemoryRegionCache *cache)
+ {
+-    if (!cache->mrs.mr) {
++    MemoryRegion *mr = cache->mrs.mr;
++
++    if (!mr) {
+         return;
+     }
+ 
+-    if (xen_enabled()) {
++    if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, cache->ptr, cache->xlat, cache->len,
++                           cache->is_write, cache->len);
++    } else if (xen_enabled()) {
+         xen_invalidate_map_cache_entry(cache->ptr);
+     }
+-    memory_region_unref(cache->mrs.mr);
++
++    memory_region_unref(mr);
+     flatview_unref(cache->fv);
+     cache->mrs.mr = NULL;
+     cache->fv = NULL;
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch
new file mode 100644
index 00000000..6b56a39e
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0005-xen-hvm-create-arch_handle_ioreq-and-arch_xen_set_me.patch
@@ -0,0 +1,192 @@
+From c38436434fc888ba8844d99eab451f9b734e5e5b Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 19:34:39 -0700
+Subject: [PATCH 05/16] xen-hvm: create arch_handle_ioreq and
+ arch_xen_set_memory
+
+In preparation to moving most of xen-hvm code to an arch-neutral
+location, move the x86-specific portion of xen_set_memory to
+arch_xen_set_memory.
+
+Also move handle_vmport_ioreq to arch_handle_ioreq.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/xen-hvm.c          | 98 ++++++++++++++++++++--------------
+ include/hw/i386/xen_arch_hvm.h | 10 ++++
+ include/hw/xen/arch_hvm.h      |  3 ++
+ 3 files changed, 71 insertions(+), 40 deletions(-)
+ create mode 100644 include/hw/i386/xen_arch_hvm.h
+ create mode 100644 include/hw/xen/arch_hvm.h
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 225cfdf8b7..178f0c68fc 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -134,6 +134,8 @@ typedef struct XenIOState {
+     Notifier exit;
+ } XenIOState;
+ 
++#include "hw/xen/arch_hvm.h"
++
+ /* Xen specific function for piix pci */
+ 
+ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
+@@ -476,10 +478,6 @@ static void xen_set_memory(struct MemoryListener *listener,
+                            bool add)
+ {
+     XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-    hwaddr start_addr = section->offset_within_address_space;
+-    ram_addr_t size = int128_get64(section->size);
+-    bool log_dirty = memory_region_is_logging(section->mr, DIRTY_MEMORY_VGA);
+-    hvmmem_type_t mem_type;
+ 
+     if (section->mr == &ram_memory) {
+         return;
+@@ -492,38 +490,7 @@ static void xen_set_memory(struct MemoryListener *listener,
+                                      section);
+         }
+     }
+-
+-    if (!memory_region_is_ram(section->mr)) {
+-        return;
+-    }
+-
+-    if (log_dirty != add) {
+-        return;
+-    }
+-
+-    trace_xen_client_set_memory(start_addr, size, log_dirty);
+-
+-    start_addr &= TARGET_PAGE_MASK;
+-    size = TARGET_PAGE_ALIGN(size);
+-
+-    if (add) {
+-        if (!memory_region_is_rom(section->mr)) {
+-            xen_add_to_physmap(state, start_addr, size,
+-                               section->mr, section->offset_within_region);
+-        } else {
+-            mem_type = HVMMEM_ram_ro;
+-            if (xen_set_mem_type(xen_domid, mem_type,
+-                                 start_addr >> TARGET_PAGE_BITS,
+-                                 size >> TARGET_PAGE_BITS)) {
+-                DPRINTF("xen_set_mem_type error, addr: "TARGET_FMT_plx"\n",
+-                        start_addr);
+-            }
+-        }
+-    } else {
+-        if (xen_remove_from_physmap(state, start_addr, size) < 0) {
+-            DPRINTF("physmapping does not exist at "TARGET_FMT_plx"\n", start_addr);
+-        }
+-    }
++    arch_xen_set_memory(state, section, add);
+ }
+ 
+ static void xen_region_add(MemoryListener *listener,
+@@ -1051,9 +1018,6 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req)
+         case IOREQ_TYPE_COPY:
+             cpu_ioreq_move(req);
+             break;
+-        case IOREQ_TYPE_VMWARE_PORT:
+-            handle_vmport_ioreq(state, req);
+-            break;
+         case IOREQ_TYPE_TIMEOFFSET:
+             break;
+         case IOREQ_TYPE_INVALIDATE:
+@@ -1063,7 +1027,7 @@ static void handle_ioreq(XenIOState *state, ioreq_t *req)
+             cpu_ioreq_config(state, req);
+             break;
+         default:
+-            hw_error("Invalid ioreq type 0x%x\n", req->type);
++            arch_handle_ioreq(state, req);
+     }
+     if (req->dir == IOREQ_READ) {
+         trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
+@@ -1604,3 +1568,57 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
+         memory_global_dirty_log_stop(GLOBAL_DIRTY_MIGRATION);
+     }
+ }
++
++void arch_xen_set_memory(XenIOState *state,MemoryRegionSection *section,
++                                bool add)
++{
++    hwaddr start_addr = section->offset_within_address_space;
++    ram_addr_t size = int128_get64(section->size);
++    bool log_dirty = memory_region_is_logging(section->mr, DIRTY_MEMORY_VGA);
++    hvmmem_type_t mem_type;
++
++    if (!memory_region_is_ram(section->mr)) {
++        return;
++    }
++
++    if (log_dirty != add) {
++        return;
++    }
++
++    trace_xen_client_set_memory(start_addr, size, log_dirty);
++
++    start_addr &= TARGET_PAGE_MASK;
++    size = TARGET_PAGE_ALIGN(size);
++
++    if (add) {
++        if (!memory_region_is_rom(section->mr)) {
++            xen_add_to_physmap(state, start_addr, size,
++                               section->mr, section->offset_within_region);
++        } else {
++            mem_type = HVMMEM_ram_ro;
++            if (xen_set_mem_type(xen_domid, mem_type,
++                                 start_addr >> TARGET_PAGE_BITS,
++                                 size >> TARGET_PAGE_BITS)) {
++                DPRINTF("xen_set_mem_type error, addr: "TARGET_FMT_plx"\n",
++                        start_addr);
++            }
++        }
++    } else {
++        if (xen_remove_from_physmap(state, start_addr, size) < 0) {
++            DPRINTF("physmapping does not exist at "TARGET_FMT_plx"\n", start_addr);
++        }
++    }
++}
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    switch (req->type) {
++        case IOREQ_TYPE_VMWARE_PORT:
++            handle_vmport_ioreq(state, req);
++            break;
++        default:
++            hw_error("Invalid ioreq type 0x%x\n", req->type);
++    }
++
++    return;
++}
+diff --git a/include/hw/i386/xen_arch_hvm.h b/include/hw/i386/xen_arch_hvm.h
+new file mode 100644
+index 0000000000..1b2c71ba4f
+--- /dev/null
++++ b/include/hw/i386/xen_arch_hvm.h
+@@ -0,0 +1,10 @@
++#ifndef HW_XEN_ARCH_I386_HVM_H
++#define HW_XEN_ARCH_I386_HVM_H
++
++#include <xen/hvm/ioreq.h>
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
++void arch_xen_set_memory(XenIOState *state,
++                         MemoryRegionSection *section,
++                         bool add);
++#endif
+diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h
+new file mode 100644
+index 0000000000..26674648d8
+--- /dev/null
++++ b/include/hw/xen/arch_hvm.h
+@@ -0,0 +1,3 @@
++#if defined(TARGET_I386) || defined(TARGET_X86_64)
++#include "hw/i386/xen_arch_hvm.h"
++#endif
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch
new file mode 100644
index 00000000..87bbc3c6
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-add-map-and-unmap-callbacks-for-grant-region.patch
@@ -0,0 +1,255 @@
+From ef94d70d4a22c5282d6955a7ed066ef502e99829 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 26 Aug 2022 13:57:06 +0200
+Subject: [PATCH 6/8] xen: add map and unmap callbacks for grant region
+
+Add the callbacks for mapping/unmapping guest memory via grants to the
+special grant memory region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/xen/xen-mapcache.c | 167 +++++++++++++++++++++++++++++++++++++++++-
+ softmmu/physmem.c     |  11 ++-
+ 2 files changed, 173 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index e53e7221f1..f81b75d216 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -9,6 +9,8 @@
+  */
+ 
+ #include "qemu/osdep.h"
++#include "qemu/queue.h"
++#include "qemu/thread.h"
+ #include "qemu/units.h"
+ #include "qemu/error-report.h"
+ 
+@@ -24,6 +26,8 @@
+ #include "sysemu/xen-mapcache.h"
+ #include "trace.h"
+ 
++#include <xenevtchn.h>
++#include <xengnttab.h>
+ 
+ //#define MAPCACHE_DEBUG
+ 
+@@ -386,7 +390,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,
+     return p;
+ }
+ 
+-ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++static ram_addr_t xen_ram_addr_from_mapcache_try(void *ptr)
+ {
+     MapCacheEntry *entry = NULL;
+     MapCacheRev *reventry;
+@@ -595,10 +599,170 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     return p;
+ }
+ 
++struct XENMappedGrantRegion {
++    void *addr;
++    unsigned int pages;
++    unsigned int refs;
++    unsigned int prot;
++    uint32_t idx;
++    QLIST_ENTRY(XENMappedGrantRegion) list;
++};
++
++static xengnttab_handle *xen_region_gnttabdev;
++static QLIST_HEAD(GrantRegionList, XENMappedGrantRegion) xen_grant_mappings =
++    QLIST_HEAD_INITIALIZER(xen_grant_mappings);
++static QemuMutex xen_map_mutex;
++
++static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
++                               bool is_write, MemTxAttrs attrs)
++{
++    unsigned int page_off = addr & (XC_PAGE_SIZE - 1);
++    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;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->idx == ref &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (!mgr) {
++        mgr = g_new(struct XENMappedGrantRegion, 1);
++
++        if (nrefs == 1) {
++            refs = &ref;
++        } else {
++            refs = g_new(uint32_t, nrefs);
++            for (i = 0; i < nrefs; i++) {
++                refs[i] = ref + i;
++            }
++        }
++        mgr->addr = xengnttab_map_domain_grant_refs(xen_region_gnttabdev, nrefs,
++                                                    xen_domid, refs, prot);
++        if (mgr->addr) {
++            mgr->pages = nrefs;
++            mgr->refs = 1;
++            mgr->prot = prot;
++            mgr->idx = ref;
++
++            QLIST_INSERT_HEAD(&xen_grant_mappings, mgr, list);
++        } else {
++            g_free(mgr);
++            mgr = NULL;
++        }
++    } else {
++        mgr->refs++;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    if (nrefs > 1) {
++        g_free(refs);
++    }
++
++    return mgr ? mgr->addr + page_off : NULL;
++}
++
++static void xen_unmap_grant_dyn(MemoryRegion *mr, void *buffer, ram_addr_t addr,
++                                hwaddr len, bool is_write, hwaddr access_len)
++{
++    unsigned int page_off = (unsigned long)buffer & (XC_PAGE_SIZE - 1);
++    unsigned int nrefs = (page_off + len + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == buffer - page_off &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (mgr) {
++        mgr->refs--;
++        if (!mgr->refs) {
++            xengnttab_unmap(xen_region_gnttabdev, mgr->addr, nrefs);
++
++            QLIST_REMOVE(mgr, list);
++            g_free(mgr);
++        }
++    } else {
++        error_report("xen_unmap_grant_dyn() trying to unmap unknown buffer");
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++}
++
++static ram_addr_t xen_ram_addr_from_grant_cache(void *ptr)
++{
++    unsigned int page_off = (unsigned long)ptr & (XC_PAGE_SIZE - 1);
++    struct XENMappedGrantRegion *mgr = NULL;
++    ram_addr_t raddr = RAM_ADDR_INVALID;
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == ptr - page_off) {
++            break;
++        }
++    }
++
++    if (mgr) {
++        raddr = (mgr->idx << XC_PAGE_SHIFT) + page_off + XEN_GRANT_ADDR_OFF;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    return raddr;
++}
++
++ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++{
++    ram_addr_t raddr;
++
++    raddr = xen_ram_addr_from_mapcache_try(ptr);
++    if (raddr == RAM_ADDR_INVALID) {
++        raddr = xen_ram_addr_from_grant_cache(ptr);
++    }
++
++    return raddr;
++}
++
++static const struct MemoryRegionOps xen_grant_mr_ops = {
++    .map = xen_map_grant_dyn,
++    .unmap = xen_unmap_grant_dyn,
++    .endianness = DEVICE_LITTLE_ENDIAN,
++};
++
+ MemoryRegion *xen_init_grant_ram(void)
+ {
+     RAMBlock *block;
+ 
++    qemu_mutex_init(&xen_map_mutex);
++
++    xen_region_gnttabdev = xengnttab_open(NULL, 0);
++    if (xen_region_gnttabdev == NULL) {
++        fprintf(stderr, "can't open gnttab device\n");
++        return NULL;
++    }
++
+     memory_region_init(&ram_grants, NULL, "xen.grants",
+                        XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
+     block = g_malloc0(sizeof(*block));
+@@ -613,6 +777,7 @@ MemoryRegion *xen_init_grant_ram(void)
+     ram_grants.ram_block = block;
+     ram_grants.ram = true;
+     ram_grants.terminates = true;
++    ram_grants.ops = &xen_grant_mr_ops;
+     ram_block_add_list(block);
+     memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
+                                 &ram_grants);
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 2038240311..6b2a02fc87 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2391,13 +2391,16 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
+ 
+     if (xen_enabled()) {
+         ram_addr_t ram_addr;
++
+         RCU_READ_LOCK_GUARD();
+         ram_addr = xen_ram_addr_from_mapcache(ptr);
+-        block = qemu_get_ram_block(ram_addr);
+-        if (block) {
+-            *offset = ram_addr - block->offset;
++        if (ram_addr != RAM_ADDR_INVALID) {
++            block = qemu_get_ram_block(ram_addr);
++            if (block) {
++                *offset = ram_addr - block->offset;
++            }
++            return block;
+         }
+-        return block;
+     }
+ 
+     RCU_READ_LOCK_GUARD();
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch
new file mode 100644
index 00000000..7df302a2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0006-xen-hvm-move-common-functions-to-hw-xen-xen-hvm-comm.patch
@@ -0,0 +1,2094 @@
+From 87d362e72e65b604da7554657204344a6540d88c Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 15:59:47 -0700
+Subject: [PATCH 06/16] xen-hvm: move common functions to
+ hw/xen/xen-hvm-common.c
+
+Extract common functionalities from xen-hvm.c and move them to
+hw/xen/xen-hvm-common.c. These common functions are useful for creating
+an IOREQ server.
+
+Moved the common usable IOREQ creation part to a new function
+xen_register_ioreq() which can be used by both x86 and ARM machines.
+
+NOTE: This patch will break the build as the patch only involves moving
+of functions. Build fixes will be in the next patch.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/i386/xen/trace-events        |  14 -
+ hw/i386/xen/xen-hvm.c           | 927 +-------------------------------
+ hw/xen/meson.build              |   5 +-
+ hw/xen/trace-events             |  14 +
+ hw/xen/xen-hvm-common.c         | 861 +++++++++++++++++++++++++++++
+ include/hw/i386/xen_arch_hvm.h  |   1 +
+ include/hw/xen/xen-hvm-common.h |  98 ++++
+ 7 files changed, 986 insertions(+), 934 deletions(-)
+ create mode 100644 hw/xen/xen-hvm-common.c
+ create mode 100644 include/hw/xen/xen-hvm-common.h
+
+diff --git a/hw/i386/xen/trace-events b/hw/i386/xen/trace-events
+index a0c89d91c4..5d0a8d6dcf 100644
+--- a/hw/i386/xen/trace-events
++++ b/hw/i386/xen/trace-events
+@@ -7,17 +7,3 @@ xen_platform_log(char *s) "xen platform: %s"
+ xen_pv_mmio_read(uint64_t addr) "WARNING: read from Xen PV Device MMIO space (address 0x%"PRIx64")"
+ xen_pv_mmio_write(uint64_t addr) "WARNING: write to Xen PV Device MMIO space (address 0x%"PRIx64")"
+ 
+-# xen-hvm.c
+-xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx"
+-xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i"
+-handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
+-cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
+-cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
+-xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
+-cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+-cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
+-
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index 178f0c68fc..36d87555a9 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -10,43 +10,21 @@
+ 
+ #include "qemu/osdep.h"
+ #include "qemu/units.h"
++#include "qapi/error.h"
++#include "qapi/qapi-commands-migration.h"
++#include "trace.h"
+ 
+-#include "cpu.h"
+-#include "hw/pci/pci.h"
+-#include "hw/pci/pci_host.h"
+ #include "hw/i386/pc.h"
+ #include "hw/irq.h"
+-#include "hw/hw.h"
+ #include "hw/i386/apic-msidef.h"
+-#include "hw/xen/xen_common.h"
+-#include "hw/xen/xen-legacy-backend.h"
+-#include "hw/xen/xen-bus.h"
+ #include "hw/xen/xen-x86.h"
+-#include "qapi/error.h"
+-#include "qapi/qapi-commands-migration.h"
+-#include "qemu/error-report.h"
+-#include "qemu/main-loop.h"
+ #include "qemu/range.h"
+-#include "sysemu/runstate.h"
+-#include "sysemu/sysemu.h"
+-#include "sysemu/xen.h"
+-#include "sysemu/xen-mapcache.h"
+-#include "trace.h"
+ 
+-#include <xen/hvm/ioreq.h>
++#include "hw/xen/xen-hvm-common.h"
++#include "hw/xen/arch_hvm.h"
+ #include <xen/hvm/e820.h>
+ 
+-//#define DEBUG_XEN_HVM
+-
+-#ifdef DEBUG_XEN_HVM
+-#define DPRINTF(fmt, ...) \
+-    do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
+-#else
+-#define DPRINTF(fmt, ...) \
+-    do { } while (0)
+-#endif
+-
+-static MemoryRegion ram_memory, ram_640k, ram_lo, ram_hi;
++static MemoryRegion ram_640k, ram_lo, ram_hi;
+ static MemoryRegion *framebuffer;
+ static bool xen_in_migration;
+ 
+@@ -75,25 +53,6 @@ typedef struct shared_vmport_iopage shared_vmport_iopage_t;
+ #endif
+ static shared_vmport_iopage_t *shared_vmport_page;
+ 
+-static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
+-{
+-    return shared_page->vcpu_ioreq[i].vp_eport;
+-}
+-static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
+-{
+-    return &shared_page->vcpu_ioreq[vcpu];
+-}
+-
+-#define BUFFER_IO_MAX_DELAY  100
+-
+-typedef struct XenPhysmap {
+-    hwaddr start_addr;
+-    ram_addr_t size;
+-    const char *name;
+-    hwaddr phys_offset;
+-
+-    QLIST_ENTRY(XenPhysmap) list;
+-} XenPhysmap;
+ 
+ static QLIST_HEAD(, XenPhysmap) xen_physmap;
+ static const XenPhysmap *log_for_dirtybit = NULL;
+@@ -102,40 +61,6 @@ static unsigned long *dirty_bitmap = NULL;
+ static Notifier suspend;
+ static Notifier wakeup;
+ 
+-typedef struct XenPciDevice {
+-    PCIDevice *pci_dev;
+-    uint32_t sbdf;
+-    QLIST_ENTRY(XenPciDevice) entry;
+-} XenPciDevice;
+-
+-typedef struct XenIOState {
+-    ioservid_t ioservid;
+-    shared_iopage_t *shared_page;
+-    buffered_iopage_t *buffered_io_page;
+-    xenforeignmemory_resource_handle *fres;
+-    QEMUTimer *buffered_io_timer;
+-    CPUState **cpu_by_vcpu_id;
+-    /* the evtchn port for polling the notification, */
+-    evtchn_port_t *ioreq_local_port;
+-    /* evtchn remote and local ports for buffered io */
+-    evtchn_port_t bufioreq_remote_port;
+-    evtchn_port_t bufioreq_local_port;
+-    /* the evtchn fd for polling */
+-    xenevtchn_handle *xce_handle;
+-    /* which vcpu we are serving */
+-    int send_vcpu;
+-
+-    struct xs_handle *xenstore;
+-    MemoryListener memory_listener;
+-    MemoryListener io_listener;
+-    QLIST_HEAD(, XenPciDevice) dev_list;
+-    DeviceListener device_listener;
+-
+-    Notifier exit;
+-} XenIOState;
+-
+-#include "hw/xen/arch_hvm.h"
+-
+ /* Xen specific function for piix pci */
+ 
+ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num)
+@@ -248,42 +173,6 @@ static void xen_ram_init(PCMachineState *pcms,
+     }
+ }
+ 
+-void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+-                   Error **errp)
+-{
+-    unsigned long nr_pfn;
+-    xen_pfn_t *pfn_list;
+-    int i;
+-
+-    if (runstate_check(RUN_STATE_INMIGRATE)) {
+-        /* RAM already populated in Xen */
+-        fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
+-                " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
+-                __func__, size, ram_addr);
+-        return;
+-    }
+-
+-    if (mr == &ram_memory) {
+-        return;
+-    }
+-
+-    trace_xen_ram_alloc(ram_addr, size);
+-
+-    nr_pfn = size >> TARGET_PAGE_BITS;
+-    pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn);
+-
+-    for (i = 0; i < nr_pfn; i++) {
+-        pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i;
+-    }
+-
+-    if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) {
+-        error_setg(errp, "xen: failed to populate ram at " RAM_ADDR_FMT,
+-                   ram_addr);
+-    }
+-
+-    g_free(pfn_list);
+-}
+-
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+ {
+     XenPhysmap *physmap = NULL;
+@@ -473,109 +362,6 @@ static int xen_remove_from_physmap(XenIOState *state,
+     return 0;
+ }
+ 
+-static void xen_set_memory(struct MemoryListener *listener,
+-                           MemoryRegionSection *section,
+-                           bool add)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, memory_listener);
+-
+-    if (section->mr == &ram_memory) {
+-        return;
+-    } else {
+-        if (add) {
+-            xen_map_memory_section(xen_domid, state->ioservid,
+-                                   section);
+-        } else {
+-            xen_unmap_memory_section(xen_domid, state->ioservid,
+-                                     section);
+-        }
+-    }
+-    arch_xen_set_memory(state, section, add);
+-}
+-
+-static void xen_region_add(MemoryListener *listener,
+-                           MemoryRegionSection *section)
+-{
+-    memory_region_ref(section->mr);
+-    xen_set_memory(listener, section, true);
+-}
+-
+-static void xen_region_del(MemoryListener *listener,
+-                           MemoryRegionSection *section)
+-{
+-    xen_set_memory(listener, section, false);
+-    memory_region_unref(section->mr);
+-}
+-
+-static void xen_io_add(MemoryListener *listener,
+-                       MemoryRegionSection *section)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, io_listener);
+-    MemoryRegion *mr = section->mr;
+-
+-    if (mr->ops == &unassigned_io_ops) {
+-        return;
+-    }
+-
+-    memory_region_ref(mr);
+-
+-    xen_map_io_section(xen_domid, state->ioservid, section);
+-}
+-
+-static void xen_io_del(MemoryListener *listener,
+-                       MemoryRegionSection *section)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, io_listener);
+-    MemoryRegion *mr = section->mr;
+-
+-    if (mr->ops == &unassigned_io_ops) {
+-        return;
+-    }
+-
+-    xen_unmap_io_section(xen_domid, state->ioservid, section);
+-
+-    memory_region_unref(mr);
+-}
+-
+-static void xen_device_realize(DeviceListener *listener,
+-                               DeviceState *dev)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, device_listener);
+-
+-    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        PCIDevice *pci_dev = PCI_DEVICE(dev);
+-        XenPciDevice *xendev = g_new(XenPciDevice, 1);
+-
+-        xendev->pci_dev = pci_dev;
+-        xendev->sbdf = PCI_BUILD_BDF(pci_dev_bus_num(pci_dev),
+-                                     pci_dev->devfn);
+-        QLIST_INSERT_HEAD(&state->dev_list, xendev, entry);
+-
+-        xen_map_pcidev(xen_domid, state->ioservid, pci_dev);
+-    }
+-}
+-
+-static void xen_device_unrealize(DeviceListener *listener,
+-                                 DeviceState *dev)
+-{
+-    XenIOState *state = container_of(listener, XenIOState, device_listener);
+-
+-    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+-        PCIDevice *pci_dev = PCI_DEVICE(dev);
+-        XenPciDevice *xendev, *next;
+-
+-        xen_unmap_pcidev(xen_domid, state->ioservid, pci_dev);
+-
+-        QLIST_FOREACH_SAFE(xendev, &state->dev_list, entry, next) {
+-            if (xendev->pci_dev == pci_dev) {
+-                QLIST_REMOVE(xendev, entry);
+-                g_free(xendev);
+-                break;
+-            }
+-        }
+-    }
+-}
+-
+ static void xen_sync_dirty_bitmap(XenIOState *state,
+                                   hwaddr start_addr,
+                                   ram_addr_t size)
+@@ -683,277 +469,6 @@ static MemoryListener xen_memory_listener = {
+     .priority = 10,
+ };
+ 
+-static MemoryListener xen_io_listener = {
+-    .name = "xen-io",
+-    .region_add = xen_io_add,
+-    .region_del = xen_io_del,
+-    .priority = 10,
+-};
+-
+-static DeviceListener xen_device_listener = {
+-    .realize = xen_device_realize,
+-    .unrealize = xen_device_unrealize,
+-};
+-
+-/* get the ioreq packets from share mem */
+-static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
+-{
+-    ioreq_t *req = xen_vcpu_ioreq(state->shared_page, vcpu);
+-
+-    if (req->state != STATE_IOREQ_READY) {
+-        DPRINTF("I/O request not ready: "
+-                "%x, ptr: %x, port: %"PRIx64", "
+-                "data: %"PRIx64", count: %u, size: %u\n",
+-                req->state, req->data_is_ptr, req->addr,
+-                req->data, req->count, req->size);
+-        return NULL;
+-    }
+-
+-    xen_rmb(); /* see IOREQ_READY /then/ read contents of ioreq */
+-
+-    req->state = STATE_IOREQ_INPROCESS;
+-    return req;
+-}
+-
+-/* use poll to get the port notification */
+-/* ioreq_vec--out,the */
+-/* retval--the number of ioreq packet */
+-static ioreq_t *cpu_get_ioreq(XenIOState *state)
+-{
+-    MachineState *ms = MACHINE(qdev_get_machine());
+-    unsigned int max_cpus = ms->smp.max_cpus;
+-    int i;
+-    evtchn_port_t port;
+-
+-    port = xenevtchn_pending(state->xce_handle);
+-    if (port == state->bufioreq_local_port) {
+-        timer_mod(state->buffered_io_timer,
+-                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
+-        return NULL;
+-    }
+-
+-    if (port != -1) {
+-        for (i = 0; i < max_cpus; i++) {
+-            if (state->ioreq_local_port[i] == port) {
+-                break;
+-            }
+-        }
+-
+-        if (i == max_cpus) {
+-            hw_error("Fatal error while trying to get io event!\n");
+-        }
+-
+-        /* unmask the wanted port again */
+-        xenevtchn_unmask(state->xce_handle, port);
+-
+-        /* get the io packet from shared memory */
+-        state->send_vcpu = i;
+-        return cpu_get_ioreq_from_shared_memory(state, i);
+-    }
+-
+-    /* read error or read nothing */
+-    return NULL;
+-}
+-
+-static uint32_t do_inp(uint32_t addr, unsigned long size)
+-{
+-    switch (size) {
+-        case 1:
+-            return cpu_inb(addr);
+-        case 2:
+-            return cpu_inw(addr);
+-        case 4:
+-            return cpu_inl(addr);
+-        default:
+-            hw_error("inp: bad size: %04x %lx", addr, size);
+-    }
+-}
+-
+-static void do_outp(uint32_t addr,
+-        unsigned long size, uint32_t val)
+-{
+-    switch (size) {
+-        case 1:
+-            return cpu_outb(addr, val);
+-        case 2:
+-            return cpu_outw(addr, val);
+-        case 4:
+-            return cpu_outl(addr, val);
+-        default:
+-            hw_error("outp: bad size: %04x %lx", addr, size);
+-    }
+-}
+-
+-/*
+- * Helper functions which read/write an object from/to physical guest
+- * memory, as part of the implementation of an ioreq.
+- *
+- * Equivalent to
+- *   cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i,
+- *                          val, req->size, 0/1)
+- * except without the integer overflow problems.
+- */
+-static void rw_phys_req_item(hwaddr addr,
+-                             ioreq_t *req, uint32_t i, void *val, int rw)
+-{
+-    /* Do everything unsigned so overflow just results in a truncated result
+-     * and accesses to undesired parts of guest memory, which is up
+-     * to the guest */
+-    hwaddr offset = (hwaddr)req->size * i;
+-    if (req->df) {
+-        addr -= offset;
+-    } else {
+-        addr += offset;
+-    }
+-    cpu_physical_memory_rw(addr, val, req->size, rw);
+-}
+-
+-static inline void read_phys_req_item(hwaddr addr,
+-                                      ioreq_t *req, uint32_t i, void *val)
+-{
+-    rw_phys_req_item(addr, req, i, val, 0);
+-}
+-static inline void write_phys_req_item(hwaddr addr,
+-                                       ioreq_t *req, uint32_t i, void *val)
+-{
+-    rw_phys_req_item(addr, req, i, val, 1);
+-}
+-
+-
+-static void cpu_ioreq_pio(ioreq_t *req)
+-{
+-    uint32_t i;
+-
+-    trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr,
+-                         req->data, req->count, req->size);
+-
+-    if (req->size > sizeof(uint32_t)) {
+-        hw_error("PIO: bad size (%u)", req->size);
+-    }
+-
+-    if (req->dir == IOREQ_READ) {
+-        if (!req->data_is_ptr) {
+-            req->data = do_inp(req->addr, req->size);
+-            trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr,
+-                                         req->size);
+-        } else {
+-            uint32_t tmp;
+-
+-            for (i = 0; i < req->count; i++) {
+-                tmp = do_inp(req->addr, req->size);
+-                write_phys_req_item(req->data, req, i, &tmp);
+-            }
+-        }
+-    } else if (req->dir == IOREQ_WRITE) {
+-        if (!req->data_is_ptr) {
+-            trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr,
+-                                          req->size);
+-            do_outp(req->addr, req->size, req->data);
+-        } else {
+-            for (i = 0; i < req->count; i++) {
+-                uint32_t tmp = 0;
+-
+-                read_phys_req_item(req->data, req, i, &tmp);
+-                do_outp(req->addr, req->size, tmp);
+-            }
+-        }
+-    }
+-}
+-
+-static void cpu_ioreq_move(ioreq_t *req)
+-{
+-    uint32_t i;
+-
+-    trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr,
+-                         req->data, req->count, req->size);
+-
+-    if (req->size > sizeof(req->data)) {
+-        hw_error("MMIO: bad size (%u)", req->size);
+-    }
+-
+-    if (!req->data_is_ptr) {
+-        if (req->dir == IOREQ_READ) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->addr, req, i, &req->data);
+-            }
+-        } else if (req->dir == IOREQ_WRITE) {
+-            for (i = 0; i < req->count; i++) {
+-                write_phys_req_item(req->addr, req, i, &req->data);
+-            }
+-        }
+-    } else {
+-        uint64_t tmp;
+-
+-        if (req->dir == IOREQ_READ) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->addr, req, i, &tmp);
+-                write_phys_req_item(req->data, req, i, &tmp);
+-            }
+-        } else if (req->dir == IOREQ_WRITE) {
+-            for (i = 0; i < req->count; i++) {
+-                read_phys_req_item(req->data, req, i, &tmp);
+-                write_phys_req_item(req->addr, req, i, &tmp);
+-            }
+-        }
+-    }
+-}
+-
+-static void cpu_ioreq_config(XenIOState *state, ioreq_t *req)
+-{
+-    uint32_t sbdf = req->addr >> 32;
+-    uint32_t reg = req->addr;
+-    XenPciDevice *xendev;
+-
+-    if (req->size != sizeof(uint8_t) && req->size != sizeof(uint16_t) &&
+-        req->size != sizeof(uint32_t)) {
+-        hw_error("PCI config access: bad size (%u)", req->size);
+-    }
+-
+-    if (req->count != 1) {
+-        hw_error("PCI config access: bad count (%u)", req->count);
+-    }
+-
+-    QLIST_FOREACH(xendev, &state->dev_list, entry) {
+-        if (xendev->sbdf != sbdf) {
+-            continue;
+-        }
+-
+-        if (!req->data_is_ptr) {
+-            if (req->dir == IOREQ_READ) {
+-                req->data = pci_host_config_read_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->size);
+-                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
+-                                            req->size, req->data);
+-            } else if (req->dir == IOREQ_WRITE) {
+-                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
+-                                             req->size, req->data);
+-                pci_host_config_write_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->data, req->size);
+-            }
+-        } else {
+-            uint32_t tmp;
+-
+-            if (req->dir == IOREQ_READ) {
+-                tmp = pci_host_config_read_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    req->size);
+-                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
+-                                            req->size, tmp);
+-                write_phys_req_item(req->data, req, 0, &tmp);
+-            } else if (req->dir == IOREQ_WRITE) {
+-                read_phys_req_item(req->data, req, 0, &tmp);
+-                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
+-                                             req->size, tmp);
+-                pci_host_config_write_common(
+-                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
+-                    tmp, req->size);
+-            }
+-        }
+-    }
+-}
+-
+ static void regs_to_cpu(vmware_regs_t *vmport_regs, ioreq_t *req)
+ {
+     X86CPU *cpu;
+@@ -997,223 +512,6 @@ static void handle_vmport_ioreq(XenIOState *state, ioreq_t *req)
+     current_cpu = NULL;
+ }
+ 
+-static void handle_ioreq(XenIOState *state, ioreq_t *req)
+-{
+-    trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr,
+-                       req->addr, req->data, req->count, req->size);
+-
+-    if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) &&
+-            (req->size < sizeof (target_ulong))) {
+-        req->data &= ((target_ulong) 1 << (8 * req->size)) - 1;
+-    }
+-
+-    if (req->dir == IOREQ_WRITE)
+-        trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr,
+-                                 req->addr, req->data, req->count, req->size);
+-
+-    switch (req->type) {
+-        case IOREQ_TYPE_PIO:
+-            cpu_ioreq_pio(req);
+-            break;
+-        case IOREQ_TYPE_COPY:
+-            cpu_ioreq_move(req);
+-            break;
+-        case IOREQ_TYPE_TIMEOFFSET:
+-            break;
+-        case IOREQ_TYPE_INVALIDATE:
+-            xen_invalidate_map_cache();
+-            break;
+-        case IOREQ_TYPE_PCI_CONFIG:
+-            cpu_ioreq_config(state, req);
+-            break;
+-        default:
+-            arch_handle_ioreq(state, req);
+-    }
+-    if (req->dir == IOREQ_READ) {
+-        trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
+-                                req->addr, req->data, req->count, req->size);
+-    }
+-}
+-
+-static bool handle_buffered_iopage(XenIOState *state)
+-{
+-    buffered_iopage_t *buf_page = state->buffered_io_page;
+-    buf_ioreq_t *buf_req = NULL;
+-    bool handled_ioreq = false;
+-    ioreq_t req;
+-    int qw;
+-
+-    if (!buf_page) {
+-        return 0;
+-    }
+-
+-    memset(&req, 0x00, sizeof(req));
+-    req.state = STATE_IOREQ_READY;
+-    req.count = 1;
+-    req.dir = IOREQ_WRITE;
+-
+-    for (;;) {
+-        uint32_t rdptr = buf_page->read_pointer, wrptr;
+-
+-        xen_rmb();
+-        wrptr = buf_page->write_pointer;
+-        xen_rmb();
+-        if (rdptr != buf_page->read_pointer) {
+-            continue;
+-        }
+-        if (rdptr == wrptr) {
+-            break;
+-        }
+-        buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM];
+-        req.size = 1U << buf_req->size;
+-        req.addr = buf_req->addr;
+-        req.data = buf_req->data;
+-        req.type = buf_req->type;
+-        xen_rmb();
+-        qw = (req.size == 8);
+-        if (qw) {
+-            if (rdptr + 1 == wrptr) {
+-                hw_error("Incomplete quad word buffered ioreq");
+-            }
+-            buf_req = &buf_page->buf_ioreq[(rdptr + 1) %
+-                                           IOREQ_BUFFER_SLOT_NUM];
+-            req.data |= ((uint64_t)buf_req->data) << 32;
+-            xen_rmb();
+-        }
+-
+-        handle_ioreq(state, &req);
+-
+-        /* Only req.data may get updated by handle_ioreq(), albeit even that
+-         * should not happen as such data would never make it to the guest (we
+-         * can only usefully see writes here after all).
+-         */
+-        assert(req.state == STATE_IOREQ_READY);
+-        assert(req.count == 1);
+-        assert(req.dir == IOREQ_WRITE);
+-        assert(!req.data_is_ptr);
+-
+-        qatomic_add(&buf_page->read_pointer, qw + 1);
+-        handled_ioreq = true;
+-    }
+-
+-    return handled_ioreq;
+-}
+-
+-static void handle_buffered_io(void *opaque)
+-{
+-    XenIOState *state = opaque;
+-
+-    if (handle_buffered_iopage(state)) {
+-        timer_mod(state->buffered_io_timer,
+-                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
+-    } else {
+-        timer_del(state->buffered_io_timer);
+-        xenevtchn_unmask(state->xce_handle, state->bufioreq_local_port);
+-    }
+-}
+-
+-static void cpu_handle_ioreq(void *opaque)
+-{
+-    XenIOState *state = opaque;
+-    ioreq_t *req = cpu_get_ioreq(state);
+-
+-    handle_buffered_iopage(state);
+-    if (req) {
+-        ioreq_t copy = *req;
+-
+-        xen_rmb();
+-        handle_ioreq(state, &copy);
+-        req->data = copy.data;
+-
+-        if (req->state != STATE_IOREQ_INPROCESS) {
+-            fprintf(stderr, "Badness in I/O request ... not in service?!: "
+-                    "%x, ptr: %x, port: %"PRIx64", "
+-                    "data: %"PRIx64", count: %u, size: %u, type: %u\n",
+-                    req->state, req->data_is_ptr, req->addr,
+-                    req->data, req->count, req->size, req->type);
+-            destroy_hvm_domain(false);
+-            return;
+-        }
+-
+-        xen_wmb(); /* Update ioreq contents /then/ update state. */
+-
+-        /*
+-         * We do this before we send the response so that the tools
+-         * have the opportunity to pick up on the reset before the
+-         * guest resumes and does a hlt with interrupts disabled which
+-         * causes Xen to powerdown the domain.
+-         */
+-        if (runstate_is_running()) {
+-            ShutdownCause request;
+-
+-            if (qemu_shutdown_requested_get()) {
+-                destroy_hvm_domain(false);
+-            }
+-            request = qemu_reset_requested_get();
+-            if (request) {
+-                qemu_system_reset(request);
+-                destroy_hvm_domain(true);
+-            }
+-        }
+-
+-        req->state = STATE_IORESP_READY;
+-        xenevtchn_notify(state->xce_handle,
+-                         state->ioreq_local_port[state->send_vcpu]);
+-    }
+-}
+-
+-static void xen_main_loop_prepare(XenIOState *state)
+-{
+-    int evtchn_fd = -1;
+-
+-    if (state->xce_handle != NULL) {
+-        evtchn_fd = xenevtchn_fd(state->xce_handle);
+-    }
+-
+-    state->buffered_io_timer = timer_new_ms(QEMU_CLOCK_REALTIME, handle_buffered_io,
+-                                                 state);
+-
+-    if (evtchn_fd != -1) {
+-        CPUState *cpu_state;
+-
+-        DPRINTF("%s: Init cpu_by_vcpu_id\n", __func__);
+-        CPU_FOREACH(cpu_state) {
+-            DPRINTF("%s: cpu_by_vcpu_id[%d]=%p\n",
+-                    __func__, cpu_state->cpu_index, cpu_state);
+-            state->cpu_by_vcpu_id[cpu_state->cpu_index] = cpu_state;
+-        }
+-        qemu_set_fd_handler(evtchn_fd, cpu_handle_ioreq, NULL, state);
+-    }
+-}
+-
+-
+-static void xen_hvm_change_state_handler(void *opaque, bool running,
+-                                         RunState rstate)
+-{
+-    XenIOState *state = opaque;
+-
+-    if (running) {
+-        xen_main_loop_prepare(state);
+-    }
+-
+-    xen_set_ioreq_server_state(xen_domid,
+-                               state->ioservid,
+-                               (rstate == RUN_STATE_RUNNING));
+-}
+-
+-static void xen_exit_notifier(Notifier *n, void *data)
+-{
+-    XenIOState *state = container_of(n, XenIOState, exit);
+-
+-    xen_destroy_ioreq_server(xen_domid, state->ioservid);
+-    if (state->fres != NULL) {
+-        xenforeignmemory_unmap_resource(xen_fmem, state->fres);
+-    }
+-
+-    xenevtchn_close(state->xce_handle);
+-    xs_daemon_close(state->xenstore);
+-}
+-
+ #ifdef XEN_COMPAT_PHYSMAP
+ static void xen_read_physmap(XenIOState *state)
+ {
+@@ -1273,178 +571,17 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
+     xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
+ }
+ 
+-static int xen_map_ioreq_server(XenIOState *state)
+-{
+-    void *addr = NULL;
+-    xen_pfn_t ioreq_pfn;
+-    xen_pfn_t bufioreq_pfn;
+-    evtchn_port_t bufioreq_evtchn;
+-    int rc;
+-
+-    /*
+-     * Attempt to map using the resource API and fall back to normal
+-     * foreign mapping if this is not supported.
+-     */
+-    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_bufioreq != 0);
+-    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_ioreq(0) != 1);
+-    state->fres = xenforeignmemory_map_resource(xen_fmem, xen_domid,
+-                                         XENMEM_resource_ioreq_server,
+-                                         state->ioservid, 0, 2,
+-                                         &addr,
+-                                         PROT_READ | PROT_WRITE, 0);
+-    if (state->fres != NULL) {
+-        trace_xen_map_resource_ioreq(state->ioservid, addr);
+-        state->buffered_io_page = addr;
+-        state->shared_page = addr + TARGET_PAGE_SIZE;
+-    } else if (errno != EOPNOTSUPP) {
+-        error_report("failed to map ioreq server resources: error %d handle=%p",
+-                     errno, xen_xc);
+-        return -1;
+-    }
+-
+-    rc = xen_get_ioreq_server_info(xen_domid, state->ioservid,
+-                                   (state->shared_page == NULL) ?
+-                                   &ioreq_pfn : NULL,
+-                                   (state->buffered_io_page == NULL) ?
+-                                   &bufioreq_pfn : NULL,
+-                                   &bufioreq_evtchn);
+-    if (rc < 0) {
+-        error_report("failed to get ioreq server info: error %d handle=%p",
+-                     errno, xen_xc);
+-        return rc;
+-    }
+-
+-    if (state->shared_page == NULL) {
+-        DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
+-
+-        state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
+-                                                  PROT_READ | PROT_WRITE,
+-                                                  1, &ioreq_pfn, NULL);
+-        if (state->shared_page == NULL) {
+-            error_report("map shared IO page returned error %d handle=%p",
+-                         errno, xen_xc);
+-        }
+-    }
+-
+-    if (state->buffered_io_page == NULL) {
+-        DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
+-
+-        state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
+-                                                       PROT_READ | PROT_WRITE,
+-                                                       1, &bufioreq_pfn,
+-                                                       NULL);
+-        if (state->buffered_io_page == NULL) {
+-            error_report("map buffered IO page returned error %d", errno);
+-            return -1;
+-        }
+-    }
+-
+-    if (state->shared_page == NULL || state->buffered_io_page == NULL) {
+-        return -1;
+-    }
+-
+-    DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
+-
+-    state->bufioreq_remote_port = bufioreq_evtchn;
+-
+-    return 0;
+-}
+-
+ void xen_hvm_init_pc(PCMachineState *pcms, MemoryRegion **ram_memory)
+ {
+     MachineState *ms = MACHINE(pcms);
+     unsigned int max_cpus = ms->smp.max_cpus;
+-    int i, rc;
++    int rc;
+     xen_pfn_t ioreq_pfn;
+     XenIOState *state;
+ 
+     state = g_new0(XenIOState, 1);
+ 
+-    state->xce_handle = xenevtchn_open(NULL, 0);
+-    if (state->xce_handle == NULL) {
+-        perror("xen: event channel open");
+-        goto err;
+-    }
+-
+-    state->xenstore = xs_daemon_open();
+-    if (state->xenstore == NULL) {
+-        perror("xen: xenstore open");
+-        goto err;
+-    }
+-
+-    xen_create_ioreq_server(xen_domid, &state->ioservid);
+-
+-    state->exit.notify = xen_exit_notifier;
+-    qemu_add_exit_notifier(&state->exit);
+-
+-    /*
+-     * Register wake-up support in QMP query-current-machine API
+-     */
+-    qemu_register_wakeup_support();
+-
+-    rc = xen_map_ioreq_server(state);
+-    if (rc < 0) {
+-        goto err;
+-    }
+-
+-    /* Note: cpus is empty at this point in init */
+-    state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
+-
+-    rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true);
+-    if (rc < 0) {
+-        error_report("failed to enable ioreq server info: error %d handle=%p",
+-                     errno, xen_xc);
+-        goto err;
+-    }
+-
+-    state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus);
+-
+-    /* FIXME: how about if we overflow the page here? */
+-    for (i = 0; i < max_cpus; i++) {
+-        rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
+-                                        xen_vcpu_eport(state->shared_page, i));
+-        if (rc == -1) {
+-            error_report("shared evtchn %d bind error %d", i, errno);
+-            goto err;
+-        }
+-        state->ioreq_local_port[i] = rc;
+-    }
+-
+-    rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
+-                                    state->bufioreq_remote_port);
+-    if (rc == -1) {
+-        error_report("buffered evtchn bind error %d", errno);
+-        goto err;
+-    }
+-    state->bufioreq_local_port = rc;
+-
+-    /* Init RAM management */
+-#ifdef XEN_COMPAT_PHYSMAP
+-    xen_map_cache_init(xen_phys_offset_to_gaddr, state);
+-#else
+-    xen_map_cache_init(NULL, state);
+-#endif
+-
+-    qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+-
+-    state->memory_listener = xen_memory_listener;
+-    memory_listener_register(&state->memory_listener, &address_space_memory);
+-
+-    state->io_listener = xen_io_listener;
+-    memory_listener_register(&state->io_listener, &address_space_io);
+-
+-    state->device_listener = xen_device_listener;
+-    QLIST_INIT(&state->dev_list);
+-    device_listener_register(&state->device_listener);
+-
+-    xen_bus_init();
+-
+-    /* Initialize backend core & drivers */
+-    if (xen_be_init() != 0) {
+-        error_report("xen backend core setup failed");
+-        goto err;
+-    }
+-    xen_be_register_common();
++    xen_register_ioreq(state, max_cpus, xen_memory_listener);
+ 
+     QLIST_INIT(&xen_physmap);
+     xen_read_physmap(state);
+@@ -1484,59 +621,11 @@ err:
+     exit(1);
+ }
+ 
+-void destroy_hvm_domain(bool reboot)
+-{
+-    xc_interface *xc_handle;
+-    int sts;
+-    int rc;
+-
+-    unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;
+-
+-    if (xen_dmod) {
+-        rc = xendevicemodel_shutdown(xen_dmod, xen_domid, reason);
+-        if (!rc) {
+-            return;
+-        }
+-        if (errno != ENOTTY /* old Xen */) {
+-            perror("xendevicemodel_shutdown failed");
+-        }
+-        /* well, try the old thing then */
+-    }
+-
+-    xc_handle = xc_interface_open(0, 0, 0);
+-    if (xc_handle == NULL) {
+-        fprintf(stderr, "Cannot acquire xenctrl handle\n");
+-    } else {
+-        sts = xc_domain_shutdown(xc_handle, xen_domid, reason);
+-        if (sts != 0) {
+-            fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
+-                    "sts %d, %s\n", reboot ? "reboot" : "poweroff",
+-                    sts, strerror(errno));
+-        } else {
+-            fprintf(stderr, "Issued domain %d %s\n", xen_domid,
+-                    reboot ? "reboot" : "poweroff");
+-        }
+-        xc_interface_close(xc_handle);
+-    }
+-}
+-
+ void xen_register_framebuffer(MemoryRegion *mr)
+ {
+     framebuffer = mr;
+ }
+ 
+-void xen_shutdown_fatal_error(const char *fmt, ...)
+-{
+-    va_list ap;
+-
+-    va_start(ap, fmt);
+-    vfprintf(stderr, fmt, ap);
+-    va_end(ap);
+-    fprintf(stderr, "Will destroy the domain.\n");
+-    /* destroy the domain */
+-    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
+-}
+-
+ void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
+ {
+     if (unlikely(xen_in_migration)) {
+diff --git a/hw/xen/meson.build b/hw/xen/meson.build
+index 19d0637c46..008e036d63 100644
+--- a/hw/xen/meson.build
++++ b/hw/xen/meson.build
+@@ -25,4 +25,7 @@ specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss)
+ 
+ xen_ss = ss.source_set()
+ 
+-xen_ss.add(when: 'CONFIG_XEN', if_true: files('xen-mapcache.c'))
++xen_ss.add(when: 'CONFIG_XEN', if_true: files(
++  'xen-mapcache.c',
++  'xen-hvm-common.c',
++))
+diff --git a/hw/xen/trace-events b/hw/xen/trace-events
+index 2c8f238f42..02ca1183da 100644
+--- a/hw/xen/trace-events
++++ b/hw/xen/trace-events
+@@ -42,6 +42,20 @@ xs_node_vscanf(char *path, char *value) "%s %s"
+ xs_node_watch(char *path) "%s"
+ xs_node_unwatch(char *path) "%s"
+ 
++# xen-hvm.c
++xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: 0x%lx, size 0x%lx"
++xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "0x%"PRIx64" size 0x%lx, log_dirty %i"
++handle_ioreq(void *req, uint32_t type, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p type=%d dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++handle_ioreq_read(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p read type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++handle_ioreq_write(void *req, uint32_t type, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p write type=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++cpu_ioreq_pio(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p pio dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++cpu_ioreq_pio_read_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio read reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
++cpu_ioreq_pio_write_reg(void *req, uint64_t data, uint64_t addr, uint32_t size) "I/O=%p pio write reg data=0x%"PRIx64" port=0x%"PRIx64" size=%d"
++cpu_ioreq_move(void *req, uint32_t dir, uint32_t df, uint32_t data_is_ptr, uint64_t addr, uint64_t data, uint32_t count, uint32_t size) "I/O=%p copy dir=%d df=%d ptr=%d port=0x%"PRIx64" data=0x%"PRIx64" count=%d size=%d"
++xen_map_resource_ioreq(uint32_t id, void *addr) "id: %u addr: %p"
++cpu_ioreq_config_read(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
++cpu_ioreq_config_write(void *req, uint32_t sbdf, uint32_t reg, uint32_t size, uint32_t data) "I/O=%p sbdf=0x%x reg=%u size=%u data=0x%x"
++
+ # xen-mapcache.c
+ xen_map_cache(uint64_t phys_addr) "want 0x%"PRIx64
+ xen_remap_bucket(uint64_t index) "index 0x%"PRIx64
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+new file mode 100644
+index 0000000000..67f76f6010
+--- /dev/null
++++ b/hw/xen/xen-hvm-common.c
+@@ -0,0 +1,861 @@
++#include "qemu/osdep.h"
++#include "qemu/units.h"
++#include "qapi/error.h"
++#include "trace.h"
++
++#include "hw/pci/pci_host.h"
++#include "hw/xen/xen-hvm-common.h"
++#include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen-bus.h"
++#include "hw/boards.h"
++#include "hw/xen/arch_hvm.h"
++
++MemoryRegion ram_memory;
++
++MemoryListener xen_io_listener = {
++    .name = "xen-io",
++    .region_add = xen_io_add,
++    .region_del = xen_io_del,
++    .priority = 10,
++};
++
++DeviceListener xen_device_listener = {
++    .realize = xen_device_realize,
++    .unrealize = xen_device_unrealize,
++};
++
++static void xen_set_memory(struct MemoryListener *listener,
++                           MemoryRegionSection *section,
++                           bool add)
++{
++    XenIOState *state = container_of(listener, XenIOState, memory_listener);
++
++    if (section->mr == &ram_memory) {
++        return;
++    } else {
++        if (add) {
++            xen_map_memory_section(xen_domid, state->ioservid,
++                                   section);
++        } else {
++            xen_unmap_memory_section(xen_domid, state->ioservid,
++                                     section);
++        }
++    }
++    arch_xen_set_memory(state, section, add);
++}
++
++void xen_region_add(MemoryListener *listener,
++                           MemoryRegionSection *section)
++{
++    memory_region_ref(section->mr);
++    xen_set_memory(listener, section, true);
++}
++
++void xen_region_del(MemoryListener *listener,
++                           MemoryRegionSection *section)
++{
++    xen_set_memory(listener, section, false);
++    memory_region_unref(section->mr);
++}
++
++void xen_io_add(MemoryListener *listener,
++                       MemoryRegionSection *section)
++{
++    XenIOState *state = container_of(listener, XenIOState, io_listener);
++    MemoryRegion *mr = section->mr;
++
++    if (mr->ops == &unassigned_io_ops) {
++        return;
++    }
++
++    memory_region_ref(mr);
++
++    xen_map_io_section(xen_domid, state->ioservid, section);
++}
++
++void xen_io_del(MemoryListener *listener,
++                       MemoryRegionSection *section)
++{
++    XenIOState *state = container_of(listener, XenIOState, io_listener);
++    MemoryRegion *mr = section->mr;
++
++    if (mr->ops == &unassigned_io_ops) {
++        return;
++    }
++
++    xen_unmap_io_section(xen_domid, state->ioservid, section);
++
++    memory_region_unref(mr);
++}
++
++void xen_device_realize(DeviceListener *listener,
++                               DeviceState *dev)
++{
++    XenIOState *state = container_of(listener, XenIOState, device_listener);
++
++    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
++        PCIDevice *pci_dev = PCI_DEVICE(dev);
++        XenPciDevice *xendev = g_new(XenPciDevice, 1);
++
++        xendev->pci_dev = pci_dev;
++        xendev->sbdf = PCI_BUILD_BDF(pci_dev_bus_num(pci_dev),
++                                     pci_dev->devfn);
++        QLIST_INSERT_HEAD(&state->dev_list, xendev, entry);
++
++        xen_map_pcidev(xen_domid, state->ioservid, pci_dev);
++    }
++}
++
++void xen_device_unrealize(DeviceListener *listener,
++                                 DeviceState *dev)
++{
++    XenIOState *state = container_of(listener, XenIOState, device_listener);
++
++    if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
++        PCIDevice *pci_dev = PCI_DEVICE(dev);
++        XenPciDevice *xendev, *next;
++
++        xen_unmap_pcidev(xen_domid, state->ioservid, pci_dev);
++
++        QLIST_FOREACH_SAFE(xendev, &state->dev_list, entry, next) {
++            if (xendev->pci_dev == pci_dev) {
++                QLIST_REMOVE(xendev, entry);
++                g_free(xendev);
++                break;
++            }
++        }
++    }
++}
++
++/* get the ioreq packets from share mem */
++static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
++{
++    ioreq_t *req = xen_vcpu_ioreq(state->shared_page, vcpu);
++
++    if (req->state != STATE_IOREQ_READY) {
++        DPRINTF("I/O request not ready: "
++                "%x, ptr: %x, port: %"PRIx64", "
++                "data: %"PRIx64", count: %u, size: %u\n",
++                req->state, req->data_is_ptr, req->addr,
++                req->data, req->count, req->size);
++        return NULL;
++    }
++
++    xen_rmb(); /* see IOREQ_READY /then/ read contents of ioreq */
++
++    req->state = STATE_IOREQ_INPROCESS;
++    return req;
++}
++
++/* use poll to get the port notification */
++/* ioreq_vec--out,the */
++/* retval--the number of ioreq packet */
++static ioreq_t *cpu_get_ioreq(XenIOState *state)
++{
++    MachineState *ms = MACHINE(qdev_get_machine());
++    unsigned int max_cpus = ms->smp.max_cpus;
++    int i;
++    evtchn_port_t port;
++
++    port = xenevtchn_pending(state->xce_handle);
++    if (port == state->bufioreq_local_port) {
++        timer_mod(state->buffered_io_timer,
++                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
++        return NULL;
++    }
++
++    if (port != -1) {
++        for (i = 0; i < max_cpus; i++) {
++            if (state->ioreq_local_port[i] == port) {
++                break;
++            }
++        }
++
++        if (i == max_cpus) {
++            hw_error("Fatal error while trying to get io event!\n");
++        }
++
++        /* unmask the wanted port again */
++        xenevtchn_unmask(state->xce_handle, port);
++
++        /* get the io packet from shared memory */
++        state->send_vcpu = i;
++        return cpu_get_ioreq_from_shared_memory(state, i);
++    }
++
++    /* read error or read nothing */
++    return NULL;
++}
++
++static uint32_t do_inp(uint32_t addr, unsigned long size)
++{
++    switch (size) {
++        case 1:
++            return cpu_inb(addr);
++        case 2:
++            return cpu_inw(addr);
++        case 4:
++            return cpu_inl(addr);
++        default:
++            hw_error("inp: bad size: %04x %lx", addr, size);
++    }
++}
++
++static void do_outp(uint32_t addr,
++        unsigned long size, uint32_t val)
++{
++    switch (size) {
++        case 1:
++            return cpu_outb(addr, val);
++        case 2:
++            return cpu_outw(addr, val);
++        case 4:
++            return cpu_outl(addr, val);
++        default:
++            hw_error("outp: bad size: %04x %lx", addr, size);
++    }
++}
++
++/*
++ * Helper functions which read/write an object from/to physical guest
++ * memory, as part of the implementation of an ioreq.
++ *
++ * Equivalent to
++ *   cpu_physical_memory_rw(addr + (req->df ? -1 : +1) * req->size * i,
++ *                          val, req->size, 0/1)
++ * except without the integer overflow problems.
++ */
++static void rw_phys_req_item(hwaddr addr,
++                             ioreq_t *req, uint32_t i, void *val, int rw)
++{
++    /* Do everything unsigned so overflow just results in a truncated result
++     * and accesses to undesired parts of guest memory, which is up
++     * to the guest */
++    hwaddr offset = (hwaddr)req->size * i;
++    if (req->df) {
++        addr -= offset;
++    } else {
++        addr += offset;
++    }
++    cpu_physical_memory_rw(addr, val, req->size, rw);
++}
++
++static inline void read_phys_req_item(hwaddr addr,
++                                      ioreq_t *req, uint32_t i, void *val)
++{
++    rw_phys_req_item(addr, req, i, val, 0);
++}
++static inline void write_phys_req_item(hwaddr addr,
++                                       ioreq_t *req, uint32_t i, void *val)
++{
++    rw_phys_req_item(addr, req, i, val, 1);
++}
++
++
++void cpu_ioreq_pio(ioreq_t *req)
++{
++    uint32_t i;
++
++    trace_cpu_ioreq_pio(req, req->dir, req->df, req->data_is_ptr, req->addr,
++                         req->data, req->count, req->size);
++
++    if (req->size > sizeof(uint32_t)) {
++        hw_error("PIO: bad size (%u)", req->size);
++    }
++
++    if (req->dir == IOREQ_READ) {
++        if (!req->data_is_ptr) {
++            req->data = do_inp(req->addr, req->size);
++            trace_cpu_ioreq_pio_read_reg(req, req->data, req->addr,
++                                         req->size);
++        } else {
++            uint32_t tmp;
++
++            for (i = 0; i < req->count; i++) {
++                tmp = do_inp(req->addr, req->size);
++                write_phys_req_item(req->data, req, i, &tmp);
++            }
++        }
++    } else if (req->dir == IOREQ_WRITE) {
++        if (!req->data_is_ptr) {
++            trace_cpu_ioreq_pio_write_reg(req, req->data, req->addr,
++                                          req->size);
++            do_outp(req->addr, req->size, req->data);
++        } else {
++            for (i = 0; i < req->count; i++) {
++                uint32_t tmp = 0;
++
++                read_phys_req_item(req->data, req, i, &tmp);
++                do_outp(req->addr, req->size, tmp);
++            }
++        }
++    }
++}
++
++static void cpu_ioreq_move(ioreq_t *req)
++{
++    uint32_t i;
++
++    trace_cpu_ioreq_move(req, req->dir, req->df, req->data_is_ptr, req->addr,
++                         req->data, req->count, req->size);
++
++    if (req->size > sizeof(req->data)) {
++        hw_error("MMIO: bad size (%u)", req->size);
++    }
++
++    if (!req->data_is_ptr) {
++        if (req->dir == IOREQ_READ) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->addr, req, i, &req->data);
++            }
++        } else if (req->dir == IOREQ_WRITE) {
++            for (i = 0; i < req->count; i++) {
++                write_phys_req_item(req->addr, req, i, &req->data);
++            }
++        }
++    } else {
++        uint64_t tmp;
++
++        if (req->dir == IOREQ_READ) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->addr, req, i, &tmp);
++                write_phys_req_item(req->data, req, i, &tmp);
++            }
++        } else if (req->dir == IOREQ_WRITE) {
++            for (i = 0; i < req->count; i++) {
++                read_phys_req_item(req->data, req, i, &tmp);
++                write_phys_req_item(req->addr, req, i, &tmp);
++            }
++        }
++    }
++}
++
++static void cpu_ioreq_config(XenIOState *state, ioreq_t *req)
++{
++    uint32_t sbdf = req->addr >> 32;
++    uint32_t reg = req->addr;
++    XenPciDevice *xendev;
++
++    if (req->size != sizeof(uint8_t) && req->size != sizeof(uint16_t) &&
++        req->size != sizeof(uint32_t)) {
++        hw_error("PCI config access: bad size (%u)", req->size);
++    }
++
++    if (req->count != 1) {
++        hw_error("PCI config access: bad count (%u)", req->count);
++    }
++
++    QLIST_FOREACH(xendev, &state->dev_list, entry) {
++        if (xendev->sbdf != sbdf) {
++            continue;
++        }
++
++        if (!req->data_is_ptr) {
++            if (req->dir == IOREQ_READ) {
++                req->data = pci_host_config_read_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->size);
++                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
++                                            req->size, req->data);
++            } else if (req->dir == IOREQ_WRITE) {
++                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
++                                             req->size, req->data);
++                pci_host_config_write_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->data, req->size);
++            }
++        } else {
++            uint32_t tmp;
++
++            if (req->dir == IOREQ_READ) {
++                tmp = pci_host_config_read_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    req->size);
++                trace_cpu_ioreq_config_read(req, xendev->sbdf, reg,
++                                            req->size, tmp);
++                write_phys_req_item(req->data, req, 0, &tmp);
++            } else if (req->dir == IOREQ_WRITE) {
++                read_phys_req_item(req->data, req, 0, &tmp);
++                trace_cpu_ioreq_config_write(req, xendev->sbdf, reg,
++                                             req->size, tmp);
++                pci_host_config_write_common(
++                    xendev->pci_dev, reg, PCI_CONFIG_SPACE_SIZE,
++                    tmp, req->size);
++            }
++        }
++    }
++}
++
++static void handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    trace_handle_ioreq(req, req->type, req->dir, req->df, req->data_is_ptr,
++                       req->addr, req->data, req->count, req->size);
++
++    if (!req->data_is_ptr && (req->dir == IOREQ_WRITE) &&
++            (req->size < sizeof (target_ulong))) {
++        req->data &= ((target_ulong) 1 << (8 * req->size)) - 1;
++    }
++
++    if (req->dir == IOREQ_WRITE)
++        trace_handle_ioreq_write(req, req->type, req->df, req->data_is_ptr,
++                                 req->addr, req->data, req->count, req->size);
++
++    switch (req->type) {
++        case IOREQ_TYPE_PIO:
++            cpu_ioreq_pio(req);
++            break;
++        case IOREQ_TYPE_COPY:
++            cpu_ioreq_move(req);
++            break;
++        case IOREQ_TYPE_TIMEOFFSET:
++            break;
++        case IOREQ_TYPE_INVALIDATE:
++            xen_invalidate_map_cache();
++            break;
++        case IOREQ_TYPE_PCI_CONFIG:
++            cpu_ioreq_config(state, req);
++            break;
++        default:
++            arch_handle_ioreq(state, req);
++    }
++    if (req->dir == IOREQ_READ) {
++        trace_handle_ioreq_read(req, req->type, req->df, req->data_is_ptr,
++                                req->addr, req->data, req->count, req->size);
++    }
++}
++
++static bool handle_buffered_iopage(XenIOState *state)
++{
++    buffered_iopage_t *buf_page = state->buffered_io_page;
++    buf_ioreq_t *buf_req = NULL;
++    bool handled_ioreq = false;
++    ioreq_t req;
++    int qw;
++
++    if (!buf_page) {
++        return 0;
++    }
++
++    memset(&req, 0x00, sizeof(req));
++    req.state = STATE_IOREQ_READY;
++    req.count = 1;
++    req.dir = IOREQ_WRITE;
++
++    for (;;) {
++        uint32_t rdptr = buf_page->read_pointer, wrptr;
++
++        xen_rmb();
++        wrptr = buf_page->write_pointer;
++        xen_rmb();
++        if (rdptr != buf_page->read_pointer) {
++            continue;
++        }
++        if (rdptr == wrptr) {
++            break;
++        }
++        buf_req = &buf_page->buf_ioreq[rdptr % IOREQ_BUFFER_SLOT_NUM];
++        req.size = 1U << buf_req->size;
++        req.addr = buf_req->addr;
++        req.data = buf_req->data;
++        req.type = buf_req->type;
++        xen_rmb();
++        qw = (req.size == 8);
++        if (qw) {
++            if (rdptr + 1 == wrptr) {
++                hw_error("Incomplete quad word buffered ioreq");
++            }
++            buf_req = &buf_page->buf_ioreq[(rdptr + 1) %
++                                           IOREQ_BUFFER_SLOT_NUM];
++            req.data |= ((uint64_t)buf_req->data) << 32;
++            xen_rmb();
++        }
++
++        handle_ioreq(state, &req);
++
++        /* Only req.data may get updated by handle_ioreq(), albeit even that
++         * should not happen as such data would never make it to the guest (we
++         * can only usefully see writes here after all).
++         */
++        assert(req.state == STATE_IOREQ_READY);
++        assert(req.count == 1);
++        assert(req.dir == IOREQ_WRITE);
++        assert(!req.data_is_ptr);
++
++        qatomic_add(&buf_page->read_pointer, qw + 1);
++    }
++
++    return handled_ioreq;
++}
++
++static void handle_buffered_io(void *opaque)
++{
++    XenIOState *state = opaque;
++
++    if (handle_buffered_iopage(state)) {
++        timer_mod(state->buffered_io_timer,
++                BUFFER_IO_MAX_DELAY + qemu_clock_get_ms(QEMU_CLOCK_REALTIME));
++    } else {
++        timer_del(state->buffered_io_timer);
++        xenevtchn_unmask(state->xce_handle, state->bufioreq_local_port);
++    }
++}
++
++static void cpu_handle_ioreq(void *opaque)
++{
++    XenIOState *state = opaque;
++    ioreq_t *req = cpu_get_ioreq(state);
++
++    handle_buffered_iopage(state);
++    if (req) {
++        ioreq_t copy = *req;
++
++        xen_rmb();
++        handle_ioreq(state, &copy);
++        req->data = copy.data;
++
++        if (req->state != STATE_IOREQ_INPROCESS) {
++            fprintf(stderr, "Badness in I/O request ... not in service?!: "
++                    "%x, ptr: %x, port: %"PRIx64", "
++                    "data: %"PRIx64", count: %u, size: %u, type: %u\n",
++                    req->state, req->data_is_ptr, req->addr,
++                    req->data, req->count, req->size, req->type);
++            destroy_hvm_domain(false);
++            return;
++        }
++
++        xen_wmb(); /* Update ioreq contents /then/ update state. */
++
++        /*
++         * We do this before we send the response so that the tools
++         * have the opportunity to pick up on the reset before the
++         * guest resumes and does a hlt with interrupts disabled which
++         * causes Xen to powerdown the domain.
++         */
++        if (runstate_is_running()) {
++            ShutdownCause request;
++
++            if (qemu_shutdown_requested_get()) {
++                destroy_hvm_domain(false);
++            }
++            request = qemu_reset_requested_get();
++            if (request) {
++                qemu_system_reset(request);
++                destroy_hvm_domain(true);
++            }
++        }
++
++        req->state = STATE_IORESP_READY;
++        xenevtchn_notify(state->xce_handle,
++                         state->ioreq_local_port[state->send_vcpu]);
++    }
++}
++
++static void xen_main_loop_prepare(XenIOState *state)
++{
++    int evtchn_fd = -1;
++
++    if (state->xce_handle != NULL) {
++        evtchn_fd = xenevtchn_fd(state->xce_handle);
++    }
++
++    state->buffered_io_timer = timer_new_ms(QEMU_CLOCK_REALTIME, handle_buffered_io,
++                                                 state);
++
++    if (evtchn_fd != -1) {
++        CPUState *cpu_state;
++
++        DPRINTF("%s: Init cpu_by_vcpu_id\n", __func__);
++        CPU_FOREACH(cpu_state) {
++            DPRINTF("%s: cpu_by_vcpu_id[%d]=%p\n",
++                    __func__, cpu_state->cpu_index, cpu_state);
++            state->cpu_by_vcpu_id[cpu_state->cpu_index] = cpu_state;
++        }
++        qemu_set_fd_handler(evtchn_fd, cpu_handle_ioreq, NULL, state);
++    }
++}
++
++
++void xen_hvm_change_state_handler(void *opaque, bool running,
++                                         RunState rstate)
++{
++    XenIOState *state = opaque;
++
++    if (running) {
++        xen_main_loop_prepare(state);
++    }
++
++    xen_set_ioreq_server_state(xen_domid,
++                               state->ioservid,
++                               (rstate == RUN_STATE_RUNNING));
++}
++
++void xen_exit_notifier(Notifier *n, void *data)
++{
++    XenIOState *state = container_of(n, XenIOState, exit);
++
++    xen_destroy_ioreq_server(xen_domid, state->ioservid);
++    if (state->fres != NULL) {
++        xenforeignmemory_unmap_resource(xen_fmem, state->fres);
++    }
++
++    xenevtchn_close(state->xce_handle);
++    xs_daemon_close(state->xenstore);
++}
++
++static int xen_map_ioreq_server(XenIOState *state)
++{
++    void *addr = NULL;
++    xen_pfn_t ioreq_pfn;
++    xen_pfn_t bufioreq_pfn;
++    evtchn_port_t bufioreq_evtchn;
++    int rc;
++
++    /*
++     * Attempt to map using the resource API and fall back to normal
++     * foreign mapping if this is not supported.
++     */
++    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_bufioreq != 0);
++    QEMU_BUILD_BUG_ON(XENMEM_resource_ioreq_server_frame_ioreq(0) != 1);
++    state->fres = xenforeignmemory_map_resource(xen_fmem, xen_domid,
++                                         XENMEM_resource_ioreq_server,
++                                         state->ioservid, 0, 2,
++                                         &addr,
++                                         PROT_READ | PROT_WRITE, 0);
++    if (state->fres != NULL) {
++        trace_xen_map_resource_ioreq(state->ioservid, addr);
++        state->buffered_io_page = addr;
++        state->shared_page = addr + TARGET_PAGE_SIZE;
++    } else if (errno != EOPNOTSUPP) {
++        error_report("failed to map ioreq server resources: error %d handle=%p",
++                     errno, xen_xc);
++        return -1;
++    }
++
++    rc = xen_get_ioreq_server_info(xen_domid, state->ioservid,
++                                   (state->shared_page == NULL) ?
++                                   &ioreq_pfn : NULL,
++                                   (state->buffered_io_page == NULL) ?
++                                   &bufioreq_pfn : NULL,
++                                   &bufioreq_evtchn);
++    if (rc < 0) {
++        error_report("failed to get ioreq server info: error %d handle=%p",
++                     errno, xen_xc);
++        return rc;
++    }
++
++    if (state->shared_page == NULL) {
++        DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
++
++        state->shared_page = xenforeignmemory_map(xen_fmem, xen_domid,
++                                                  PROT_READ | PROT_WRITE,
++                                                  1, &ioreq_pfn, NULL);
++        if (state->shared_page == NULL) {
++            error_report("map shared IO page returned error %d handle=%p",
++                         errno, xen_xc);
++        }
++    }
++
++    if (state->buffered_io_page == NULL) {
++        DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
++
++        state->buffered_io_page = xenforeignmemory_map(xen_fmem, xen_domid,
++                                                       PROT_READ | PROT_WRITE,
++                                                       1, &bufioreq_pfn,
++                                                       NULL);
++        if (state->buffered_io_page == NULL) {
++            error_report("map buffered IO page returned error %d", errno);
++            return -1;
++        }
++    }
++
++    if (state->shared_page == NULL || state->buffered_io_page == NULL) {
++        return -1;
++    }
++
++    DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
++
++    state->bufioreq_remote_port = bufioreq_evtchn;
++
++    return 0;
++}
++
++void xen_shutdown_fatal_error(const char *fmt, ...)
++{
++    va_list ap;
++
++    va_start(ap, fmt);
++    vfprintf(stderr, fmt, ap);
++    va_end(ap);
++    fprintf(stderr, "Will destroy the domain.\n");
++    /* destroy the domain */
++    qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
++}
++
++void destroy_hvm_domain(bool reboot)
++{
++    xc_interface *xc_handle;
++    int sts;
++    int rc;
++
++    unsigned int reason = reboot ? SHUTDOWN_reboot : SHUTDOWN_poweroff;
++
++    if (xen_dmod) {
++        rc = xendevicemodel_shutdown(xen_dmod, xen_domid, reason);
++        if (!rc) {
++            return;
++        }
++        if (errno != ENOTTY /* old Xen */) {
++            perror("xendevicemodel_shutdown failed");
++        }
++        /* well, try the old thing then */
++    }
++
++    xc_handle = xc_interface_open(0, 0, 0);
++    if (xc_handle == NULL) {
++        fprintf(stderr, "Cannot acquire xenctrl handle\n");
++    } else {
++        sts = xc_domain_shutdown(xc_handle, xen_domid, reason);
++        if (sts != 0) {
++            fprintf(stderr, "xc_domain_shutdown failed to issue %s, "
++                    "sts %d, %s\n", reboot ? "reboot" : "poweroff",
++                    sts, strerror(errno));
++        } else {
++            fprintf(stderr, "Issued domain %d %s\n", xen_domid,
++                    reboot ? "reboot" : "poweroff");
++        }
++        xc_interface_close(xc_handle);
++    }
++}
++
++void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
++                   Error **errp)
++{
++    unsigned long nr_pfn;
++    xen_pfn_t *pfn_list;
++    int i;
++
++    if (runstate_check(RUN_STATE_INMIGRATE)) {
++        /* RAM already populated in Xen */
++        fprintf(stderr, "%s: do not alloc "RAM_ADDR_FMT
++                " bytes of ram at "RAM_ADDR_FMT" when runstate is INMIGRATE\n",
++                __func__, size, ram_addr);
++        return;
++    }
++
++    if (mr == &ram_memory) {
++        return;
++    }
++
++    trace_xen_ram_alloc(ram_addr, size);
++
++    nr_pfn = size >> TARGET_PAGE_BITS;
++    pfn_list = g_malloc(sizeof (*pfn_list) * nr_pfn);
++
++    for (i = 0; i < nr_pfn; i++) {
++        pfn_list[i] = (ram_addr >> TARGET_PAGE_BITS) + i;
++    }
++
++    if (xc_domain_populate_physmap_exact(xen_xc, xen_domid, nr_pfn, 0, 0, pfn_list)) {
++        error_setg(errp, "xen: failed to populate ram at " RAM_ADDR_FMT,
++                   ram_addr);
++    }
++
++    g_free(pfn_list);
++}
++
++void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
++                        MemoryListener xen_memory_listener)
++{
++    int i, rc;
++
++    state->xce_handle = xenevtchn_open(NULL, 0);
++    if (state->xce_handle == NULL) {
++        perror("xen: event channel open");
++        goto err;
++    }
++
++    state->xenstore = xs_daemon_open();
++    if (state->xenstore == NULL) {
++        perror("xen: xenstore open");
++        goto err;
++    }
++
++    xen_create_ioreq_server(xen_domid, &state->ioservid);
++
++    state->exit.notify = xen_exit_notifier;
++    qemu_add_exit_notifier(&state->exit);
++
++    /*
++     * Register wake-up support in QMP query-current-machine API
++     */
++    qemu_register_wakeup_support();
++
++    rc = xen_map_ioreq_server(state);
++    if (rc < 0) {
++        goto err;
++    }
++
++    /* Note: cpus is empty at this point in init */
++    state->cpu_by_vcpu_id = g_new0(CPUState *, max_cpus);
++
++    rc = xen_set_ioreq_server_state(xen_domid, state->ioservid, true);
++    if (rc < 0) {
++        error_report("failed to enable ioreq server info: error %d handle=%p",
++                     errno, xen_xc);
++        goto err;
++    }
++
++    state->ioreq_local_port = g_new0(evtchn_port_t, max_cpus);
++
++    /* FIXME: how about if we overflow the page here? */
++    for (i = 0; i < max_cpus; i++) {
++        rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
++                                        xen_vcpu_eport(state->shared_page, i));
++        if (rc == -1) {
++            error_report("shared evtchn %d bind error %d", i, errno);
++            goto err;
++        }
++        state->ioreq_local_port[i] = rc;
++    }
++
++    rc = xenevtchn_bind_interdomain(state->xce_handle, xen_domid,
++                                    state->bufioreq_remote_port);
++    if (rc == -1) {
++        error_report("buffered evtchn bind error %d", errno);
++        goto err;
++    }
++    state->bufioreq_local_port = rc;
++
++    /* Init RAM management */
++#ifdef XEN_COMPAT_PHYSMAP
++    xen_map_cache_init(xen_phys_offset_to_gaddr, state);
++#else
++    xen_map_cache_init(NULL, state);
++#endif
++
++    qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
++
++    state->memory_listener = xen_memory_listener;
++    memory_listener_register(&state->memory_listener, &address_space_memory);
++
++    state->io_listener = xen_io_listener;
++    memory_listener_register(&state->io_listener, &address_space_io);
++
++    state->device_listener = xen_device_listener;
++    QLIST_INIT(&state->dev_list);
++    device_listener_register(&state->device_listener);
++
++    xen_bus_init();
++
++    /* Initialize backend core & drivers */
++    if (xen_be_init() != 0) {
++        error_report("xen backend core setup failed");
++        goto err;
++    }
++    xen_be_register_common();
++
++    return;
++err:
++    error_report("xen hardware virtual machine initialisation failed");
++    exit(1);
++}
+diff --git a/include/hw/i386/xen_arch_hvm.h b/include/hw/i386/xen_arch_hvm.h
+index 1b2c71ba4f..1000f8f543 100644
+--- a/include/hw/i386/xen_arch_hvm.h
++++ b/include/hw/i386/xen_arch_hvm.h
+@@ -2,6 +2,7 @@
+ #define HW_XEN_ARCH_I386_HVM_H
+ 
+ #include <xen/hvm/ioreq.h>
++#include "hw/xen/xen-hvm-common.h"
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
+ void arch_xen_set_memory(XenIOState *state,
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+new file mode 100644
+index 0000000000..2979f84ee2
+--- /dev/null
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -0,0 +1,98 @@
++#ifndef HW_XEN_HVM_COMMON_H
++#define HW_XEN_HVM_COMMON_H
++
++#include "qemu/osdep.h"
++#include "qemu/units.h"
++
++#include "cpu.h"
++#include "hw/pci/pci.h"
++#include "hw/hw.h"
++#include "hw/xen/xen_common.h"
++#include "sysemu/runstate.h"
++#include "sysemu/sysemu.h"
++#include "sysemu/xen.h"
++#include "sysemu/xen-mapcache.h"
++
++#include <xen/hvm/ioreq.h>
++
++extern MemoryRegion ram_memory;
++extern MemoryListener xen_io_listener;
++extern DeviceListener xen_device_listener;
++
++//#define DEBUG_XEN_HVM
++
++#ifdef DEBUG_XEN_HVM
++#define DPRINTF(fmt, ...) \
++    do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
++#else
++#define DPRINTF(fmt, ...) \
++    do { } while (0)
++#endif
++
++static inline uint32_t xen_vcpu_eport(shared_iopage_t *shared_page, int i)
++{
++    return shared_page->vcpu_ioreq[i].vp_eport;
++}
++static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
++{
++    return &shared_page->vcpu_ioreq[vcpu];
++}
++
++#define BUFFER_IO_MAX_DELAY  100
++
++typedef struct XenPhysmap {
++    hwaddr start_addr;
++    ram_addr_t size;
++    const char *name;
++    hwaddr phys_offset;
++
++    QLIST_ENTRY(XenPhysmap) list;
++} XenPhysmap;
++
++typedef struct XenPciDevice {
++    PCIDevice *pci_dev;
++    uint32_t sbdf;
++    QLIST_ENTRY(XenPciDevice) entry;
++} XenPciDevice;
++
++typedef struct XenIOState {
++    ioservid_t ioservid;
++    shared_iopage_t *shared_page;
++    buffered_iopage_t *buffered_io_page;
++    xenforeignmemory_resource_handle *fres;
++    QEMUTimer *buffered_io_timer;
++    CPUState **cpu_by_vcpu_id;
++    /* the evtchn port for polling the notification, */
++    evtchn_port_t *ioreq_local_port;
++    /* evtchn remote and local ports for buffered io */
++    evtchn_port_t bufioreq_remote_port;
++    evtchn_port_t bufioreq_local_port;
++    /* the evtchn fd for polling */
++    xenevtchn_handle *xce_handle;
++    /* which vcpu we are serving */
++    int send_vcpu;
++
++    struct xs_handle *xenstore;
++    MemoryListener memory_listener;
++    MemoryListener io_listener;
++    QLIST_HEAD(, XenPciDevice) dev_list;
++    DeviceListener device_listener;
++
++    Notifier exit;
++} XenIOState;
++
++void xen_exit_notifier(Notifier *n, void *data);
++
++void xen_region_add(MemoryListener *listener, MemoryRegionSection *section);
++void xen_region_del(MemoryListener *listener, MemoryRegionSection *section);
++void xen_io_add(MemoryListener *listener, MemoryRegionSection *section);
++void xen_io_del(MemoryListener *listener, MemoryRegionSection *section);
++void xen_device_realize(DeviceListener *listener, DeviceState *dev);
++void xen_device_unrealize(DeviceListener *listener, DeviceState *dev);
++
++void xen_hvm_change_state_handler(void *opaque, bool running, RunState rstate);
++void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
++                        MemoryListener xen_memory_listener);
++
++void cpu_ioreq_pio(ioreq_t *req);
++#endif /* HW_XEN_HVM_COMMON_H */
+-- 
+2.17.1
+
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
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch
new file mode 100644
index 00000000..83a18c08
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0007-xen-skip-ioreq-creation-on-ioreq-registration-failur.patch
@@ -0,0 +1,42 @@
+From fa475ec44fc78ff246e6536c8b9d408abadbb4a4 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Fri, 1 Jul 2022 18:50:59 -0700
+Subject: [PATCH 07/16] xen: skip ioreq creation on ioreq registration failure
+
+On ARM it is possible to have a functioning xenpv machine with only the
+PV backends and no IOREQ server. If the IOREQ server creation fails
+continue to the PV backends initialization.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/xen/xen-hvm-common.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 67f76f6010..7e7d23397f 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -780,7 +780,11 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
+         goto err;
+     }
+ 
+-    xen_create_ioreq_server(xen_domid, &state->ioservid);
++    rc = xen_create_ioreq_server(xen_domid, &state->ioservid);
++    if (rc) {
++        DPRINTF("xen: failed to create ioreq server\n");
++        goto no_ioreq;
++    }
+ 
+     state->exit.notify = xen_exit_notifier;
+     qemu_add_exit_notifier(&state->exit);
+@@ -845,6 +849,7 @@ void xen_register_ioreq(XenIOState *state, unsigned int max_cpus,
+     QLIST_INIT(&state->dev_list);
+     device_listener_register(&state->device_listener);
+ 
++no_ioreq:
+     xen_bus_init();
+ 
+     /* Initialize backend core & drivers */
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch
new file mode 100644
index 00000000..881076fb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-accel-xen-xen-all-export-xenstore_record_dm_state.patch
@@ -0,0 +1,48 @@
+From 13443fe86bb100849c55b41873f48e0b121c7bc0 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:14 -0700
+Subject: [PATCH 08/16] accel/xen/xen-all: export xenstore_record_dm_state
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ accel/xen/xen-all.c  | 2 +-
+ include/hw/xen/xen.h | 2 ++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/accel/xen/xen-all.c b/accel/xen/xen-all.c
+index 69aa7d018b..276625b78b 100644
+--- a/accel/xen/xen-all.c
++++ b/accel/xen/xen-all.c
+@@ -100,7 +100,7 @@ void xenstore_store_pv_console_info(int i, Chardev *chr)
+ }
+ 
+ 
+-static void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
++void xenstore_record_dm_state(struct xs_handle *xs, const char *state)
+ {
+     char path[50];
+ 
+diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h
+index afdf9c436a..31e9538a5c 100644
+--- a/include/hw/xen/xen.h
++++ b/include/hw/xen/xen.h
+@@ -9,6 +9,7 @@
+  */
+ 
+ #include "exec/cpu-common.h"
++#include <xenstore.h>
+ 
+ /* xen-machine.c */
+ enum xen_mode {
+@@ -31,5 +32,6 @@ qemu_irq *xen_interrupt_controller_init(void);
+ void xenstore_store_pv_console_info(int i, Chardev *chr);
+ 
+ void xen_register_framebuffer(struct MemoryRegion *mr);
++void xenstore_record_dm_state(struct xs_handle *xs, const char *state);
+ 
+ #endif /* QEMU_HW_XEN_H */
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch
new file mode 100644
index 00000000..3b83d229
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0008-hw-arm-Add-grant-mapping.patch
@@ -0,0 +1,39 @@
+From b5e5f60de37bb6f71bc34ecb989c31ef5c834272 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 31 Jan 2023 21:46:43 +0000
+Subject: [PATCH 8/8] hw: arm: Add grant mapping.
+
+Add support for grant mapping and change qemu machine name to xenpvh.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 4ac425a3c5..392bed7367 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -35,7 +35,7 @@
+ #include "sysemu/tpm.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpv")
++#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpvh")
+ OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
+ 
+ static MemoryListener xen_memory_listener = {
+@@ -115,6 +115,9 @@ static void xen_init_ram(MachineState *machine)
+         DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
+                 GUEST_RAM1_BASE, ram_size[1]);
+     }
++
++    DPRINTF("init grant ram mapping for XEN\n");
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+-- 
+2.25.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch
new file mode 100644
index 00000000..1b1aea76
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0009-xen-hvm-enable-xen-hvm-common-build-for-ARM.patch
@@ -0,0 +1,43 @@
+From 2e6a9f464fd1f247c41ce3666ff3e3f66920d0b7 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:15 -0700
+Subject: [PATCH 09/16] xen-hvm: enable xen-hvm-common build for ARM
+
+Add CONFIG_XEN for aarch64 device and change xen-hvm-common.c to
+support build for ARM targets.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/meson.build | 1 +
+ meson.build        | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/meson.build b/hw/arm/meson.build
+index 92f9f6e000..3aac913bfd 100644
+--- a/hw/arm/meson.build
++++ b/hw/arm/meson.build
+@@ -62,5 +62,6 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.
+ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c'))
+ arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c'))
+ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
++arm_ss.add_all(xen_ss)
+ 
+ hw_arch += {'arm': arm_ss}
+diff --git a/meson.build b/meson.build
+index 5c6b5a1c75..b94f0cd76e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -125,7 +125,7 @@ endif
+ if cpu in ['x86', 'x86_64', 'arm', 'aarch64']
+   # i386 emulator provides xenpv machine type for multiple architectures
+   accelerator_targets += {
+-    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'],
++    'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'],
+   }
+ endif
+ if cpu in ['x86', 'x86_64']
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch
new file mode 100644
index 00000000..fc979b52
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0010-hw-arm-introduce-xenpv-machine.patch
@@ -0,0 +1,230 @@
+From 5618a18b1f12d567a8ef85240d55b841e18ef472 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 1 Jul 2022 17:28:16 -0700
+Subject: [PATCH 10/16] hw/arm: introduce xenpv machine
+
+Create a new machine xenpv which creates a IOREQ server to connect
+with Xen. It also creates a tpm-tis-device which connects to swtpm to
+support TPM functionalities.
+
+Xen IOREQ connection expect the TARGET_PAGE_SIZE to 4096, and the xenpv
+machine on ARM will have no CPU definitions. We need to define
+TARGET_PAGE_SIZE appropriately ourselves.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/meson.build            |   1 +
+ hw/arm/xen_arm.c              | 156 ++++++++++++++++++++++++++++++++++
+ include/hw/arm/xen_arch_hvm.h |  12 +++
+ include/hw/xen/arch_hvm.h     |   2 +
+ 4 files changed, 171 insertions(+)
+ create mode 100644 hw/arm/xen_arm.c
+ create mode 100644 include/hw/arm/xen_arch_hvm.h
+
+diff --git a/hw/arm/meson.build b/hw/arm/meson.build
+index 3aac913bfd..0cae024374 100644
+--- a/hw/arm/meson.build
++++ b/hw/arm/meson.build
+@@ -62,6 +62,7 @@ arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.
+ arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c'))
+ arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c'))
+ arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c'))
++arm_ss.add(when: 'CONFIG_XEN', if_true: files('xen_arm.c'))
+ arm_ss.add_all(xen_ss)
+ 
+ hw_arch += {'arm': arm_ss}
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+new file mode 100644
+index 0000000000..0922e3db84
+--- /dev/null
++++ b/hw/arm/xen_arm.c
+@@ -0,0 +1,156 @@
++/*
++ * QEMU ARM Xen PV Machine
++ *
++ *
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is
++ * furnished to do so, subject to the following conditions:
++ *
++ * The above copyright notice and this permission notice shall be included in
++ * all copies or substantial portions of the Software.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
++ */
++
++#include "qemu/osdep.h"
++#include "qemu/error-report.h"
++#include "qapi/qapi-commands-migration.h"
++#include "hw/boards.h"
++#include "hw/sysbus.h"
++#include "sysemu/block-backend.h"
++#include "sysemu/tpm_backend.h"
++#include "sysemu/sysemu.h"
++#include "hw/xen/xen-legacy-backend.h"
++#include "hw/xen/xen-hvm-common.h"
++#include "sysemu/tpm.h"
++#include "hw/xen/arch_hvm.h"
++
++#define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpv")
++OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
++
++static MemoryListener xen_memory_listener = {
++    .region_add = xen_region_add,
++    .region_del = xen_region_del,
++    .log_start = NULL,
++    .log_stop = NULL,
++    .log_sync = NULL,
++    .log_global_start = NULL,
++    .log_global_stop = NULL,
++    .priority = 10,
++};
++
++struct XenArmState {
++    /*< private >*/
++    MachineState parent;
++
++    XenIOState *state;
++};
++
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
++{
++    hw_error("Invalid ioreq type 0x%x\n", req->type);
++
++    return;
++}
++
++void arch_xen_set_memory(XenIOState *state,MemoryRegionSection *section,
++                         bool add)
++{
++}
++
++void xen_hvm_modified_memory(ram_addr_t start, ram_addr_t length)
++{
++}
++
++void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
++{
++}
++
++static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
++{
++    xen_dmod = xendevicemodel_open(0, 0);
++    xen_xc = xc_interface_open(0, 0, 0);
++
++    if (xen_xc == NULL) {
++        perror("xen: can't open xen interface\n");
++        return -1;
++    }
++
++    xen_fmem = xenforeignmemory_open(0, 0);
++    if (xen_fmem == NULL) {
++        perror("xen: can't open xen fmem interface\n");
++        xc_interface_close(xen_xc);
++        return -1;
++    }
++
++    xen_register_ioreq(state, max_cpus, xen_memory_listener);
++
++    xenstore_record_dm_state(xenstore, "running");
++
++    return 0;
++}
++
++
++static void xen_arm_init(MachineState *machine)
++{
++    DeviceState *dev;
++    SysBusDevice *busdev;
++    Error *errp = NULL;
++    XenArmState *xam = XEN_ARM(machine);
++
++    xam->state =  g_new0(XenIOState, 1);
++
++    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
++        return;
++    }
++
++    TPMBackend *be = qemu_find_tpm_be("tpm0");
++    if (be == NULL) {
++        DPRINTF("Couldn't fine the backend for tpm0\n");
++        return;
++    }
++
++    dev = qdev_new(TYPE_TPM_TIS_SYSBUS);
++    object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp);
++    object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp);
++    busdev = SYS_BUS_DEVICE(dev);
++    sysbus_realize_and_unref(busdev, &error_fatal);
++    sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
++
++    DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++
++    return;
++}
++
++static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
++{
++
++    MachineClass *mc = MACHINE_CLASS(oc);
++    mc->desc = "Xen Para-virtualized PC";
++    mc->init = xen_arm_init;
++    mc->max_cpus = 1;
++    machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
++}
++
++static const TypeInfo xen_arm_machine_type = {
++    .name = TYPE_XEN_ARM,
++    .parent = TYPE_MACHINE,
++    .class_init = xen_arm_machine_class_init,
++    .instance_size = sizeof(XenArmState),
++};
++
++static void xen_arm_machine_register_types(void)
++{
++    type_register_static(&xen_arm_machine_type);
++}
++
++type_init(xen_arm_machine_register_types)
+diff --git a/include/hw/arm/xen_arch_hvm.h b/include/hw/arm/xen_arch_hvm.h
+new file mode 100644
+index 0000000000..f645dfec28
+--- /dev/null
++++ b/include/hw/arm/xen_arch_hvm.h
+@@ -0,0 +1,12 @@
++#ifndef HW_XEN_ARCH_ARM_HVM_H
++#define HW_XEN_ARCH_ARM_HVM_H
++
++#include <xen/hvm/ioreq.h>
++void arch_handle_ioreq(XenIOState *state, ioreq_t *req);
++void arch_xen_set_memory(XenIOState *state,
++                         MemoryRegionSection *section,
++                         bool add);
++
++#undef TARGET_PAGE_SIZE
++#define TARGET_PAGE_SIZE 4096
++#endif
+diff --git a/include/hw/xen/arch_hvm.h b/include/hw/xen/arch_hvm.h
+index 26674648d8..c7c515220d 100644
+--- a/include/hw/xen/arch_hvm.h
++++ b/include/hw/xen/arch_hvm.h
+@@ -1,3 +1,5 @@
+ #if defined(TARGET_I386) || defined(TARGET_X86_64)
+ #include "hw/i386/xen_arch_hvm.h"
++#elif defined(TARGET_ARM) || defined(TARGET_ARM_64)
++#include "hw/arm/xen_arch_hvm.h"
+ #endif
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch
new file mode 100644
index 00000000..dad3029f
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0011-meson.build-do-not-set-have_xen_pci_passthrough-for-.patch
@@ -0,0 +1,33 @@
+From f4ff3490639dea08fb70ec69d60fe73ef479073b Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Thu, 7 Jul 2022 14:03:41 -0700
+Subject: [PATCH 11/16] meson.build: do not set have_xen_pci_passthrough for
+ aarch64 targets
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+have_xen_pci_passthrough is only used for Xen x86 VMs.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index b94f0cd76e..a4965251ab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1469,6 +1469,8 @@ have_xen_pci_passthrough = get_option('xen_pci_passthrough') \
+            error_message: 'Xen PCI passthrough requested but Xen not enabled') \
+   .require(targetos == 'linux',
+            error_message: 'Xen PCI passthrough not available on this platform') \
++  .require(cpu == 'x86'  or cpu == 'x86_64',
++           error_message: 'Xen PCI passthrough not available on this platform') \
+   .allowed()
+ 
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch
new file mode 100644
index 00000000..f80a0873
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0012-xen-arm-call-qemu_find_tpm_be-if-CONFIG_TPM.patch
@@ -0,0 +1,72 @@
+From a26982a55fa5f47116b344ca5d411f00c3a2b422 Mon Sep 17 00:00:00 2001
+From: Stefano Stabellini <stefano.stabellini@amd.com>
+Date: Thu, 7 Jul 2022 14:35:33 -0700
+Subject: [PATCH 12/16] xen-arm: call qemu_find_tpm_be if CONFIG_TPM
+
+qemu_find_tpm_be is only availablen when CONFIG_TPM is enabled.
+So #ifdef the call to make sure the code builds correctly even when
+CONFIG_TPM is not enabled.
+
+Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
+---
+ hw/arm/xen_arm.c | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 0922e3db84..f248b5744a 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -99,26 +99,18 @@ static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
+     return 0;
+ }
+ 
+-
+-static void xen_arm_init(MachineState *machine)
++static void xen_enable_tpm(void)
+ {
++#ifdef CONFIG_TPM
++    Error *errp = NULL;
+     DeviceState *dev;
+     SysBusDevice *busdev;
+-    Error *errp = NULL;
+-    XenArmState *xam = XEN_ARM(machine);
+-
+-    xam->state =  g_new0(XenIOState, 1);
+-
+-    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+-        return;
+-    }
+ 
+     TPMBackend *be = qemu_find_tpm_be("tpm0");
+     if (be == NULL) {
+         DPRINTF("Couldn't fine the backend for tpm0\n");
+         return;
+     }
+-
+     dev = qdev_new(TYPE_TPM_TIS_SYSBUS);
+     object_property_set_link(OBJECT(dev), "tpmdev", OBJECT(be), &errp);
+     object_property_set_str(OBJECT(dev), "tpmdev", be->id, &errp);
+@@ -127,6 +119,20 @@ static void xen_arm_init(MachineState *machine)
+     sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
+ 
+     DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++#endif
++}
++
++static void xen_arm_init(MachineState *machine)
++{
++    XenArmState *xam = XEN_ARM(machine);
++
++    xam->state =  g_new0(XenIOState, 1);
++
++    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
++        return;
++    }
++
++    xen_enable_tpm();
+ 
+     return;
+ }
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch
new file mode 100644
index 00000000..1aa09efb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0013-arm-xenpv-fix-TPM-address-print-warning.patch
@@ -0,0 +1,27 @@
+From c5b128668d9cd1e1cb4da80d5bc8aaebc6ff2e19 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Fri, 23 Dec 2022 00:06:29 +0000
+Subject: [PATCH 13/16] arm: xenpv: fix TPM address print warning
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Acked-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index f248b5744a..153cedfeb4 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -118,7 +118,7 @@ static void xen_enable_tpm(void)
+     sysbus_realize_and_unref(busdev, &error_fatal);
+     sysbus_mmio_map(busdev, 0, GUEST_TPM_BASE);
+ 
+-    DPRINTF("Connected tpmdev at address 0x%lx\n", GUEST_TPM_BASE);
++    DPRINTF("Connected tpmdev at address 0x%llx\n", GUEST_TPM_BASE);
+ #endif
+ }
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
new file mode 100644
index 00000000..a6925acf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0014-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
@@ -0,0 +1,83 @@
+From 3dc39d71c3652bea37dc955d5dbf8cd391d2aed0 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Sat, 30 Jul 2022 17:51:19 +0300
+Subject: [PATCH 14/16] xen_arm: Create virtio-mmio devices during
+ initialization
+
+In order to use virtio backends we need to allocate virtio-mmio
+parameters (irq and base) and register corresponding buses.
+
+Use the constants defined in public header arch-arm.h to be
+aligned with the toolstack. So the number of current supported
+virtio-mmio devices is 10.
+
+For the interrupts triggering use already existing on Arm
+device-model hypercall.
+
+The toolstack should then insert the same amount of device nodes
+into guest device-tree.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 29 +++++++++++++++++++++++++++++
+ 1 file changed, 29 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 153cedfeb4..2012ee7aff 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -25,6 +25,7 @@
+ #include "qemu/error-report.h"
+ #include "qapi/qapi-commands-migration.h"
+ #include "hw/boards.h"
++#include "hw/irq.h"
+ #include "hw/sysbus.h"
+ #include "sysemu/block-backend.h"
+ #include "sysemu/tpm_backend.h"
+@@ -55,6 +56,32 @@ struct XenArmState {
+     XenIOState *state;
+ };
+ 
++#define VIRTIO_MMIO_DEV_SIZE   0x200
++
++#define NR_VIRTIO_MMIO_DEVICES   \
++   (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST)
++
++static void xen_set_irq(void *opaque, int irq, int level)
++{
++    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++}
++
++static void xen_create_virtio_mmio_devices(XenArmState *xam)
++{
++    int i;
++
++    for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) {
++        hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE;
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_MMIO_SPI_FIRST + i);
++
++        sysbus_create_simple("virtio-mmio", base, irq);
++
++        DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n",
++                i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -132,6 +159,8 @@ static void xen_arm_init(MachineState *machine)
+         return;
+     }
+ 
++    xen_create_virtio_mmio_devices(xam);
++
+     xen_enable_tpm();
+ 
+     return;
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
new file mode 100644
index 00000000..7c2b272d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
@@ -0,0 +1,105 @@
+From a284a53c5374e19ac37b884f2dd50293e7c8070e Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Sat, 30 Jul 2022 17:18:06 +0300
+Subject: [PATCH 15/16] xen_arm: Initialize RAM and add hi/low memory regions
+
+In order to use virtio backends we need to initialize RAM for the
+xen-mapcache (which is responsible for mapping guest memory using foreign
+mapping) to work. Calculate and add hi/low memory regions based on
+machine->ram_size.
+
+Use the constants defined in public header arch-arm.h to be aligned with the
+toolstack.
+
+The toolstack should then pass real ram_size using "-m" arg.
+If "-m" is not given, create a QEMU machine without IOREQ, TPM and VIRTIO to
+keep it usable for /etc/init.d/xencommons.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 46 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 2012ee7aff..fde919df29 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -56,6 +56,8 @@ struct XenArmState {
+     XenIOState *state;
+ };
+ 
++static MemoryRegion ram_lo, ram_hi;
++
+ #define VIRTIO_MMIO_DEV_SIZE   0x200
+ 
+ #define NR_VIRTIO_MMIO_DEVICES   \
+@@ -82,6 +84,39 @@ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+     }
+ }
+ 
++static void xen_init_ram(MachineState *machine)
++{
++    MemoryRegion *sysmem = get_system_memory();
++    ram_addr_t block_len, ram_size[GUEST_RAM_BANKS];
++
++    if (machine->ram_size <= GUEST_RAM0_SIZE) {
++        ram_size[0] = machine->ram_size;
++        ram_size[1] = 0;
++        block_len = GUEST_RAM0_BASE + ram_size[0];
++    } else {
++        ram_size[0] = GUEST_RAM0_SIZE;
++        ram_size[1] = machine->ram_size - GUEST_RAM0_SIZE;
++        block_len = GUEST_RAM1_BASE + ram_size[1];
++    }
++
++    memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len,
++                           &error_fatal);
++
++    memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory,
++                             GUEST_RAM0_BASE, ram_size[0]);
++    memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo);
++    DPRINTF("Initialized region xen.ram.lo: base 0x%llx size 0x%lx\n",
++            GUEST_RAM0_BASE, ram_size[0]);
++
++    if (ram_size[1] > 0) {
++        memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory,
++                                 GUEST_RAM1_BASE, ram_size[1]);
++        memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi);
++        DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
++                GUEST_RAM1_BASE, ram_size[1]);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -155,6 +190,14 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xam->state =  g_new0(XenIOState, 1);
+ 
++    if (machine->ram_size == 0) {
++        DPRINTF("ram_size not specified. QEMU machine will be started without"
++                " TPM, IOREQ and Virtio-MMIO backends\n");
++        return;
++    }
++
++    xen_init_ram(machine);
++
+     if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+         return;
+     }
+@@ -173,6 +216,9 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->desc = "Xen Para-virtualized PC";
+     mc->init = xen_arm_init;
+     mc->max_cpus = 1;
++    /* Set explicitly here to make sure that real ram_size is passed */
++    mc->default_ram_size = 0;
++
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ }
+ 
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch
new file mode 100644
index 00000000..14f2e240
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0016-xen_arm-Add-accel-xen-and-drop-extra-interface-openi.patch
@@ -0,0 +1,79 @@
+From a730d5ea4a0445a8c694b56583dd06bd000fae74 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 4 Jan 2023 23:05:25 +0000
+Subject: [PATCH 16/16] xen_arm: Add "accel = xen" and drop extra interface
+ openings
+
+In order to use virtio backends we need to make sure that Xen accelerator
+is enabled (xen_enabled() returns true) as the memory/cache systems
+check for xen_enabled() to perform specific actions. Without that
+the xen-mapcache (which is needed for mapping guest memory) is not in use.
+
+Also drop extra interface opening as this is already done in xen-all.c
+(so drop xen_init_ioreq() completely) and skip virtio/tpm initialization
+if device emulation is not available.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c | 29 ++---------------------------
+ 1 file changed, 2 insertions(+), 27 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index fde919df29..4ac425a3c5 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -137,30 +137,6 @@ void qmp_xen_set_global_dirty_log(bool enable, Error **errp)
+ {
+ }
+ 
+-static int xen_init_ioreq(XenIOState *state, unsigned int max_cpus)
+-{
+-    xen_dmod = xendevicemodel_open(0, 0);
+-    xen_xc = xc_interface_open(0, 0, 0);
+-
+-    if (xen_xc == NULL) {
+-        perror("xen: can't open xen interface\n");
+-        return -1;
+-    }
+-
+-    xen_fmem = xenforeignmemory_open(0, 0);
+-    if (xen_fmem == NULL) {
+-        perror("xen: can't open xen fmem interface\n");
+-        xc_interface_close(xen_xc);
+-        return -1;
+-    }
+-
+-    xen_register_ioreq(state, max_cpus, xen_memory_listener);
+-
+-    xenstore_record_dm_state(xenstore, "running");
+-
+-    return 0;
+-}
+-
+ static void xen_enable_tpm(void)
+ {
+ #ifdef CONFIG_TPM
+@@ -198,9 +174,7 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_init_ram(machine);
+ 
+-    if (xen_init_ioreq(xam->state, machine->smp.cpus)) {
+-        return;
+-    }
++    xen_register_ioreq(xam->state, machine->smp.cpus, xen_memory_listener);
+ 
+     xen_create_virtio_mmio_devices(xam);
+ 
+@@ -218,6 +192,7 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->max_cpus = 1;
+     /* Set explicitly here to make sure that real ram_size is passed */
+     mc->default_ram_size = 0;
++    mc->default_machine_opts = "accel=xen";
+ 
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ }
+-- 
+2.17.1
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch
new file mode 100644
index 00000000..6e3b40f7
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-arm-xenpvh-Introduce-virtio-pci-support.patch
@@ -0,0 +1,353 @@
+From 3104d411ee36487ea409ba5a1b474989326f70f2 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 15 Nov 2023 14:19:31 -0800
+Subject: [PATCH] arm: xenpvh: Introduce virtio-pci support
+
+The bridge is needed for virtio-pci support, as QEMU can emulate the
+whole bridge with any virtio-pci devices connected to it.
+
+NOTE: A few xen-hvm-common.c and xen_native.h changes are cherry-picked from
+EPAM QEMU patches for xen-arm. This was done to keep least diff with upstream.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
+---
+ hw/arm/xen_arm.c            | 271 ++++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h |   3 +
+ 2 files changed, 274 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 1587e2a43b..a7c5b20777 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -34,6 +34,7 @@
+ #include "hw/xen/xen-hvm-common.h"
+ #include "sysemu/tpm.h"
+ #include "hw/xen/arch_hvm.h"
++#include "hw/pci-host/gpex.h"
+ 
+ #define TYPE_XEN_ARM  MACHINE_TYPE_NAME("xenpvh")
+ OBJECT_DECLARE_SIMPLE_TYPE(XenArmState, XEN_ARM)
+@@ -57,6 +58,9 @@ struct XenArmState {
+ 
+     struct {
+         uint64_t tpm_base_addr;
++        MemMapEntry pcie_mmio;
++        MemMapEntry pcie_ecam;
++        MemMapEntry pcie_mmio_high;
+     } cfg;
+ };
+ 
+@@ -132,6 +136,80 @@ static void xen_init_ram(MachineState *machine)
+     ram_grants = *xen_init_grant_ram();
+ }
+ 
++static bool xen_validate_pcie_config(XenArmState *xam)
++{
++    if (xam->cfg.pcie_ecam.base == 0 &&
++        xam->cfg.pcie_ecam.size == 0 &&
++        xam->cfg.pcie_mmio.base == 0 &&
++        xam->cfg.pcie_mmio.size == 0 &&
++        xam->cfg.pcie_mmio_high.base == 0 &&
++        xam->cfg.pcie_mmio_high.size == 0) {
++        /* It's okay, user just don't want PCIe brige */
++        return false;
++    }
++
++    if (xam->cfg.pcie_ecam.base == 0 ||
++        xam->cfg.pcie_ecam.size == 0 ||
++        xam->cfg.pcie_mmio.base == 0 ||
++        xam->cfg.pcie_mmio.size == 0 ||
++        xam->cfg.pcie_mmio_high.base == 0 ||
++        xam->cfg.pcie_mmio_high.size == 0) {
++        /* User provided some PCIe options, but not all of them */
++        error_printf("Incomplete PCIe bridge configuration\n");
++        exit(1);
++    }
++
++    return true;
++}
++
++static void xen_create_pcie(XenArmState *xam)
++{
++    MemoryRegion *mmio_alias, *mmio_alias_high, *mmio_reg;
++    MemoryRegion *ecam_alias, *ecam_reg;
++    DeviceState *dev;
++    int i;
++
++    dev = qdev_new(TYPE_GPEX_HOST);
++    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
++
++    /* Map ECAM space */
++    ecam_alias = g_new0(MemoryRegion, 1);
++    ecam_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
++    memory_region_init_alias(ecam_alias, OBJECT(dev), "pcie-ecam",
++                             ecam_reg, 0, xam->cfg.pcie_ecam.size);
++    memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_ecam.base,
++                                ecam_alias);
++
++    /* Map the MMIO space */
++    mmio_alias = g_new0(MemoryRegion, 1);
++    mmio_reg = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 1);
++    memory_region_init_alias(mmio_alias, OBJECT(dev), "pcie-mmio",
++                             mmio_reg,
++                             xam->cfg.pcie_mmio.base,
++                             xam->cfg.pcie_mmio.size);
++    memory_region_add_subregion(get_system_memory(), xam->cfg.pcie_mmio.base,
++                                mmio_alias);
++
++    /* Map the MMIO_HIGH space */
++    mmio_alias_high = g_new0(MemoryRegion, 1);
++    memory_region_init_alias(mmio_alias_high, OBJECT(dev), "pcie-mmio-high",
++                             mmio_reg,
++                             xam->cfg.pcie_mmio_high.base,
++                             xam->cfg.pcie_mmio_high.size);
++    memory_region_add_subregion(get_system_memory(),
++                                xam->cfg.pcie_mmio_high.base,
++                                mmio_alias_high);
++
++    /* Legacy PCI interrupts (#INTA - #INTD) */
++    for (i = 0; i < GPEX_NUM_IRQS; i++) {
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_PCI_SPI_FIRST + i);
++
++        sysbus_connect_irq(SYS_BUS_DEVICE(dev), i, irq);
++        gpex_set_irq_num(GPEX_HOST(dev), i, GUEST_VIRTIO_PCI_SPI_FIRST + i);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -193,6 +271,13 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_create_virtio_mmio_devices(xam);
+ 
++    if (xen_validate_pcie_config(xam)) {
++        xen_create_pcie(xam);
++    } else {
++        DPRINTF("PCIe host bridge is not configured,"
++                " only virtio-mmio can be used\n");
++    }
++
+ #ifdef CONFIG_TPM
+     if (xam->cfg.tpm_base_addr) {
+         xen_enable_tpm(xam);
+@@ -228,6 +313,150 @@ static void xen_arm_set_tpm_base_addr(Object *obj, Visitor *v,
+ }
+ #endif
+ 
++static void xen_arm_get_pcie_ecam_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_ecam.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_ecam_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_ecam.base = value;
++}
++
++static void xen_arm_get_pcie_ecam_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_ecam.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_ecam_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_ecam.size = value;
++}
++
++static void xen_arm_get_pcie_mmio_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_mmio_base_addr(Object *obj, Visitor *v,
++                                           const char *name, void *opaque,
++                                           Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio.base = value;
++}
++
++static void xen_arm_get_pcie_mmio_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_mmio_size(Object *obj, Visitor *v,
++                                      const char *name, void *opaque,
++                                      Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio.size = value;
++}
++
++static void xen_arm_get_pcie_prefetch_base_addr(Object *obj, Visitor *v,
++                                               const char *name, void *opaque,
++                                               Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio_high.base;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_prefetch_base_addr(Object *obj, Visitor *v,
++                                               const char *name, void *opaque,
++                                               Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio_high.base = value;
++}
++
++static void xen_arm_get_pcie_prefetch_size(Object *obj, Visitor *v,
++                                          const char *name, void *opaque,
++                                          Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value = xam->cfg.pcie_mmio_high.size;
++
++    visit_type_uint64(v, name, &value, errp);
++}
++
++static void xen_arm_set_pcie_prefetch_size(Object *obj, Visitor *v,
++                                          const char *name, void *opaque,
++                                          Error **errp)
++{
++    XenArmState *xam = XEN_ARM(obj);
++    uint64_t value;
++
++    if (!visit_type_uint64(v, name, &value, errp)) {
++        return;
++    }
++
++    xam->cfg.pcie_mmio_high.size = value;
++}
++
+ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+ {
+ 
+@@ -249,6 +478,48 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+ 
+     machine_class_allow_dynamic_sysbus_dev(mc, TYPE_TPM_TIS_SYSBUS);
+ #endif
++
++    object_class_property_add(oc, "pci-ecam-base-addr", "uint64_t",
++                              xen_arm_get_pcie_ecam_base_addr,
++                              xen_arm_set_pcie_ecam_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-ecam-base-addr",
++                                          "Set Base address for PCI ECAM.");
++
++    object_class_property_add(oc, "pci-ecam-size", "uint64_t",
++                              xen_arm_get_pcie_ecam_size,
++                              xen_arm_set_pcie_ecam_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-ecam-size",
++                                          "Set Size for PCI ECAM.");
++
++    object_class_property_add(oc, "pci-mmio-base-addr", "uint64_t",
++                              xen_arm_get_pcie_mmio_base_addr,
++                              xen_arm_set_pcie_mmio_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-mmio-base-addr",
++                                          "Set Base address for PCI MMIO.");
++
++    object_class_property_add(oc, "pci-mmio-size", "uint64_t",
++                              xen_arm_get_pcie_mmio_size,
++                              xen_arm_set_pcie_mmio_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-mmio-size",
++                                          "Set size for PCI MMIO.");
++
++    object_class_property_add(oc, "pci-prefetch-base-addr", "uint64_t",
++                              xen_arm_get_pcie_prefetch_base_addr,
++                              xen_arm_set_pcie_prefetch_base_addr,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-prefetch-base-addr",
++                                          "Set Prefetch Base address for PCI.");
++
++    object_class_property_add(oc, "pci-prefetch-size", "uint64_t",
++                              xen_arm_get_pcie_prefetch_size,
++                              xen_arm_set_pcie_prefetch_size,
++                              NULL, NULL);
++    object_class_property_set_description(oc, "pci-prefetch-size",
++                                          "Set Prefetch size for PCI.");
+ }
+ 
+ static const TypeInfo xen_arm_machine_type = {
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 6f09c48823..1e81189a27 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -539,6 +539,9 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+ #define GUEST_VIRTIO_MMIO_SPI_LAST    43
+ #endif
+ 
++#define GUEST_VIRTIO_PCI_SPI_FIRST    44
++#define GUEST_VIRTIO_PCI_SPI_LAST     48
++
+ #if defined(__i386__) || defined(__x86_64__)
+ #define GUEST_RAM_BANKS   2
+ #define GUEST_RAM0_BASE   0x40000000ULL /* 3GB of low RAM @ 1GB */
+-- 
+2.30.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
new file mode 100644
index 00000000..1757e9e2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0001-xen_arm-Create-virtio-mmio-devices-during-initializa.patch
@@ -0,0 +1,116 @@
+From b9291457ca2eb4340c71d2eed08fde83916c9fa4 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Tue, 29 Aug 2023 21:35:17 -0700
+Subject: [PATCH 01/11] xen_arm: Create virtio-mmio devices during
+ initialization
+
+In order to use virtio backends we need to allocate virtio-mmio
+parameters (irq and base) and register corresponding buses.
+
+Use the constants defined in public header arch-arm.h to be
+aligned with the toolstack. So the number of current supported
+virtio-mmio devices is 10.
+
+For the interrupts triggering use already existing on Arm
+device-model hypercall.
+
+The toolstack should then insert the same amount of device nodes
+into guest device-tree.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c            | 35 +++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h | 16 ++++++++++++++++
+ 2 files changed, 51 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 1d3e6d481a..7393b37355 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -26,6 +26,7 @@
+ #include "qapi/qapi-commands-migration.h"
+ #include "qapi/visitor.h"
+ #include "hw/boards.h"
++#include "hw/irq.h"
+ #include "hw/sysbus.h"
+ #include "sysemu/block-backend.h"
+ #include "sysemu/tpm_backend.h"
+@@ -59,6 +60,38 @@ struct XenArmState {
+     } cfg;
+ };
+ 
++/*
++ * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen
++ * repository.
++ *
++ * Origin: git://xenbits.xen.org/xen.git 2128143c114c
++ */
++#define VIRTIO_MMIO_DEV_SIZE   0x200
++
++#define NR_VIRTIO_MMIO_DEVICES   \
++   (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST)
++
++static void xen_set_irq(void *opaque, int irq, int level)
++{
++    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++}
++
++static void xen_create_virtio_mmio_devices(XenArmState *xam)
++{
++    int i;
++
++    for (i = 0; i < NR_VIRTIO_MMIO_DEVICES; i++) {
++        hwaddr base = GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE;
++        qemu_irq irq = qemu_allocate_irq(xen_set_irq, NULL,
++                                         GUEST_VIRTIO_MMIO_SPI_FIRST + i);
++
++        sysbus_create_simple("virtio-mmio", base, irq);
++
++        DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n",
++                i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -110,6 +143,8 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener);
+ 
++    xen_create_virtio_mmio_devices(xam);
++
+ #ifdef CONFIG_TPM
+     if (xam->cfg.tpm_base_addr) {
+         xen_enable_tpm(xam);
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 4dce905fde..a4b1aa9e5d 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -523,4 +523,20 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
+                                                  enable);
+ }
+ 
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
++static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
++                                               domid_t domid, uint32_t irq,
++                                               unsigned int level)
++{
++    return 0;
++}
++#endif
++
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41700
++#define GUEST_VIRTIO_MMIO_BASE   xen_mk_ullong(0x02000000)
++#define GUEST_VIRTIO_MMIO_SIZE   xen_mk_ullong(0x00100000)
++#define GUEST_VIRTIO_MMIO_SPI_FIRST   33
++#define GUEST_VIRTIO_MMIO_SPI_LAST    43
++#endif
++
+ #endif /* QEMU_HW_XEN_NATIVE_H */
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
new file mode 100644
index 00000000..f88db620
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0002-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch
@@ -0,0 +1,124 @@
+From 70a74795c5071bf591e6e557b7c8c492ead0e675 Mon Sep 17 00:00:00 2001
+From: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Date: Tue, 29 Aug 2023 21:35:18 -0700
+Subject: [PATCH 02/11] xen_arm: Initialize RAM and add hi/low memory regions
+
+In order to use virtio backends we need to initialize RAM for the
+xen-mapcache (which is responsible for mapping guest memory using foreign
+mapping) to work. Calculate and add hi/low memory regions based on
+machine->ram_size.
+
+Use the constants defined in public header arch-arm.h to be aligned with the xen
+toolstack.
+
+While using this machine, the toolstack should then pass real ram_size using
+"-m" arg. If "-m" is not given, create a QEMU machine without IOREQ and other
+emulated devices like TPM and VIRTIO. This is done to keep this QEMU machine
+usable for /etc/init.d/xencommons.
+
+Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
+---
+ hw/arm/xen_arm.c            | 45 +++++++++++++++++++++++++++++++++++++
+ include/hw/xen/xen_native.h |  8 +++++++
+ 2 files changed, 53 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index 7393b37355..f83b983ec5 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -60,6 +60,8 @@ struct XenArmState {
+     } cfg;
+ };
+ 
++static MemoryRegion ram_lo, ram_hi;
++
+ /*
+  * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c under Xen
+  * repository.
+@@ -92,6 +94,39 @@ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+     }
+ }
+ 
++static void xen_init_ram(MachineState *machine)
++{
++    MemoryRegion *sysmem = get_system_memory();
++    ram_addr_t block_len, ram_size[GUEST_RAM_BANKS];
++
++    if (machine->ram_size <= GUEST_RAM0_SIZE) {
++        ram_size[0] = machine->ram_size;
++        ram_size[1] = 0;
++        block_len = GUEST_RAM0_BASE + ram_size[0];
++    } else {
++        ram_size[0] = GUEST_RAM0_SIZE;
++        ram_size[1] = machine->ram_size - GUEST_RAM0_SIZE;
++        block_len = GUEST_RAM1_BASE + ram_size[1];
++    }
++
++    memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len,
++                           &error_fatal);
++
++    memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory,
++                             GUEST_RAM0_BASE, ram_size[0]);
++    memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo);
++    DPRINTF("Initialized region xen.ram.lo: base 0x%llx size 0x%lx\n",
++            GUEST_RAM0_BASE, ram_size[0]);
++
++    if (ram_size[1] > 0) {
++        memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory,
++                                 GUEST_RAM1_BASE, ram_size[1]);
++        memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi);
++        DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
++                GUEST_RAM1_BASE, ram_size[1]);
++    }
++}
++
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+ {
+     hw_error("Invalid ioreq type 0x%x\n", req->type);
+@@ -141,6 +176,14 @@ static void xen_arm_init(MachineState *machine)
+ 
+     xam->state =  g_new0(XenIOState, 1);
+ 
++    if (machine->ram_size == 0) {
++        DPRINTF("ram_size not specified. QEMU machine started without IOREQ"
++                "(no emulated devices including Virtio)\n");
++        return;
++    }
++
++    xen_init_ram(machine);
++
+     xen_register_ioreq(xam->state, machine->smp.cpus, &xen_memory_listener);
+ 
+     xen_create_virtio_mmio_devices(xam);
+@@ -188,6 +231,8 @@ static void xen_arm_machine_class_init(ObjectClass *oc, void *data)
+     mc->init = xen_arm_init;
+     mc->max_cpus = 1;
+     mc->default_machine_opts = "accel=xen";
++    /* Set explicitly here to make sure that real ram_size is passed */
++    mc->default_ram_size = 0;
+ 
+ #ifdef CONFIG_TPM
+     object_class_property_add(oc, "tpm-base-addr", "uint64_t",
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index a4b1aa9e5d..5d2718261f 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -539,4 +539,12 @@ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+ #define GUEST_VIRTIO_MMIO_SPI_LAST    43
+ #endif
+ 
++#if defined(__i386__) || defined(__x86_64__)
++#define GUEST_RAM_BANKS   2
++#define GUEST_RAM0_BASE   0x40000000ULL /* 3GB of low RAM @ 1GB */
++#define GUEST_RAM0_SIZE   0xc0000000ULL
++#define GUEST_RAM1_BASE   0x0200000000ULL /* 1016GB of RAM @ 8GB */
++#define GUEST_RAM1_SIZE   0xfe00000000ULL
++#endif
++
+ #endif /* QEMU_HW_XEN_NATIVE_H */
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch
new file mode 100644
index 00000000..c6945d54
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0003-Xen-Fix-xen_set_irq-and-xendevicemodel_set_irq_level.patch
@@ -0,0 +1,55 @@
+From 14b9dbd7f0261ae7a36bef251924ba211beef17a Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Wed, 1 Nov 2023 14:07:23 -0700
+Subject: [PATCH 03/11] Xen: Fix xen_set_irq() and
+ xendevicemodel_set_irq_level()
+
+Remove '=' from 'if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500'.
+Because xendevicemodel_set_irq_level() was introduced in 4.15 version.
+
+Also, update xendevicemodel_set_irq_level() to return -1 for older versions.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/arm/xen_arm.c            | 4 +++-
+ include/hw/xen/xen_native.h | 4 ++--
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index f83b983ec5..a5631529d0 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -75,7 +75,9 @@ static MemoryRegion ram_lo, ram_hi;
+ 
+ static void xen_set_irq(void *opaque, int irq, int level)
+ {
+-    xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level);
++    if (xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level)) {
++        error_report("xendevicemodel_set_irq_level failed");
++    }
+ }
+ 
+ static void xen_create_virtio_mmio_devices(XenArmState *xam)
+diff --git a/include/hw/xen/xen_native.h b/include/hw/xen/xen_native.h
+index 5d2718261f..6f09c48823 100644
+--- a/include/hw/xen/xen_native.h
++++ b/include/hw/xen/xen_native.h
+@@ -523,12 +523,12 @@ static inline int xen_set_ioreq_server_state(domid_t dom,
+                                                  enable);
+ }
+ 
+-#if CONFIG_XEN_CTRL_INTERFACE_VERSION <= 41500
++#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41500
+ static inline int xendevicemodel_set_irq_level(xendevicemodel_handle *dmod,
+                                                domid_t domid, uint32_t irq,
+                                                unsigned int level)
+ {
+-    return 0;
++    return -1;
+ }
+ #endif
+ 
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
new file mode 100644
index 00000000..da2f042b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0004-xen-when-unplugging-emulated-devices-skip-virtio-dev.patch
@@ -0,0 +1,70 @@
+From 02507086b3ad9beb9c669aae54fcb4857cd61ef8 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Tue, 16 Mar 2021 14:00:33 +0100
+Subject: [PATCH 04/11] xen: when unplugging emulated devices skip virtio
+ devices
+
+Virtio devices should never be unplugged at boot time, as they are
+similar to pci passthrough devices.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ docs/system/i386/xen.rst   |  3 ---
+ hw/i386/xen/xen_platform.c | 10 ++++++++--
+ 2 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/docs/system/i386/xen.rst b/docs/system/i386/xen.rst
+index f06765e88c..b86d57af6e 100644
+--- a/docs/system/i386/xen.rst
++++ b/docs/system/i386/xen.rst
+@@ -52,9 +52,6 @@ It is necessary to use the pc machine type, as the q35 machine uses AHCI instead
+ of legacy IDE, and AHCI disks are not unplugged through the Xen PV unplug
+ mechanism.
+ 
+-VirtIO devices can also be used; Linux guests may need to be dissuaded from
+-umplugging them by adding 'xen_emul_unplug=never' on their command line.
+-
+ Properties
+ ----------
+ 
+diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
+index 17457ff3de..0187b73eeb 100644
+--- a/hw/i386/xen/xen_platform.c
++++ b/hw/i386/xen/xen_platform.c
+@@ -28,6 +28,7 @@
+ #include "hw/ide/pci.h"
+ #include "hw/pci/pci.h"
+ #include "migration/vmstate.h"
++#include "hw/virtio/virtio-bus.h"
+ #include "net/net.h"
+ #include "trace.h"
+ #include "sysemu/xen.h"
+@@ -129,10 +130,11 @@ static bool pci_device_is_passthrough(PCIDevice *d)
+ 
+ static void unplug_nic(PCIBus *b, PCIDevice *d, void *o)
+ {
+-    /* We have to ignore passthrough devices */
++    /* We have to ignore passthrough devices  and virtio devices. */
+     if (pci_get_word(d->config + PCI_CLASS_DEVICE) ==
+             PCI_CLASS_NETWORK_ETHERNET
+-            && !pci_device_is_passthrough(d)) {
++            && !pci_device_is_passthrough(d)
++            && !qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
+         object_unparent(OBJECT(d));
+     }
+ }
+@@ -208,6 +210,10 @@ static void unplug_disks(PCIBus *b, PCIDevice *d, void *opaque)
+     /* We have to ignore passthrough devices */
+     if (pci_device_is_passthrough(d))
+         return;
++    /* Ignore virtio devices */
++    if (qdev_get_child_bus(&d->qdev, TYPE_VIRTIO_BUS)) {
++        return;
++    }
+ 
+     switch (pci_get_word(d->config + PCI_CLASS_DEVICE)) {
+     case PCI_CLASS_STORAGE_IDE:
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch
new file mode 100644
index 00000000..3c39dd19
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0005-softmmu-physmem-Split-ram_block_add.patch
@@ -0,0 +1,117 @@
+From d4774a0e5e1ebed605c5d49e81433fd371d0b680 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 17 Oct 2023 20:22:26 +0000
+Subject: [PATCH 05/11] softmmu: physmem: Split ram_block_add()
+
+Extract ram block list update to a new function ram_block_add_list(). This is
+done to support grant mappings which adds a memory region for granted memory and
+updates the ram_block list.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ include/exec/ram_addr.h |  1 +
+ softmmu/physmem.c       | 62 ++++++++++++++++++++++++++---------------
+ 2 files changed, 40 insertions(+), 23 deletions(-)
+
+diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
+index 9f2e3893f5..76fa360463 100644
+--- a/include/exec/ram_addr.h
++++ b/include/exec/ram_addr.h
+@@ -139,6 +139,7 @@ void qemu_ram_free(RAMBlock *block);
+ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp);
+ 
+ void qemu_ram_msync(RAMBlock *block, ram_addr_t start, ram_addr_t length);
++void ram_block_add_list(RAMBlock *new_block);
+ 
+ /* Clear whole block of mem */
+ static inline void qemu_ram_block_writeback(RAMBlock *block)
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index 3df73542e1..f73629733e 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -1786,12 +1786,47 @@ static void dirty_memory_extend(ram_addr_t old_ram_size,
+     }
+ }
+ 
++static void ram_block_add_list_locked(RAMBlock *new_block)
++ {
++     RAMBlock *block;
++     RAMBlock *last_block = NULL;
++
++    /*
++     * Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
++     * QLIST (which has an RCU-friendly variant) does not have insertion at
++     * tail, so save the last element in last_block.
++     */
++    RAMBLOCK_FOREACH(block) {
++        last_block = block;
++        if (block->max_length < new_block->max_length) {
++            break;
++        }
++    }
++    if (block) {
++        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
++    } else if (last_block) {
++        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
++    } else { /* list is empty */
++        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
++    }
++    ram_list.mru_block = NULL;
++
++    /* Write list before version */
++    smp_wmb();
++    ram_list.version++;
++}
++
++void ram_block_add_list(RAMBlock *new_block)
++{
++    qemu_mutex_lock_ramlist();
++    ram_block_add_list_locked(new_block);
++    qemu_mutex_unlock_ramlist();
++}
++
+ static void ram_block_add(RAMBlock *new_block, Error **errp)
+ {
+     const bool noreserve = qemu_ram_is_noreserve(new_block);
+     const bool shared = qemu_ram_is_shared(new_block);
+-    RAMBlock *block;
+-    RAMBlock *last_block = NULL;
+     ram_addr_t old_ram_size, new_ram_size;
+     Error *err = NULL;
+ 
+@@ -1829,28 +1864,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp)
+     if (new_ram_size > old_ram_size) {
+         dirty_memory_extend(old_ram_size, new_ram_size);
+     }
+-    /* Keep the list sorted from biggest to smallest block.  Unlike QTAILQ,
+-     * QLIST (which has an RCU-friendly variant) does not have insertion at
+-     * tail, so save the last element in last_block.
+-     */
+-    RAMBLOCK_FOREACH(block) {
+-        last_block = block;
+-        if (block->max_length < new_block->max_length) {
+-            break;
+-        }
+-    }
+-    if (block) {
+-        QLIST_INSERT_BEFORE_RCU(block, new_block, next);
+-    } else if (last_block) {
+-        QLIST_INSERT_AFTER_RCU(last_block, new_block, next);
+-    } else { /* list is empty */
+-        QLIST_INSERT_HEAD_RCU(&ram_list.blocks, new_block, next);
+-    }
+-    ram_list.mru_block = NULL;
++ 
++    ram_block_add_list_locked(new_block);
+ 
+-    /* Write list before version */
+-    smp_wmb();
+-    ram_list.version++;
+     qemu_mutex_unlock_ramlist();
+ 
+     cpu_physical_memory_set_dirty_range(new_block->offset,
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch
new file mode 100644
index 00000000..a43748fe
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0006-xen-add-pseudo-RAM-region-for-grant-mappings.patch
@@ -0,0 +1,153 @@
+From 637d10471fef76a7ab0e8f5631ea3c85ff5ce9db Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:19:58 +0200
+Subject: [PATCH 06/11] xen: add pseudo RAM region for grant mappings
+
+Add a memory region which can be used to automatically map granted
+memory. It is starting at 0x8000000000000000ULL in order to be able to
+distinguish it from normal RAM.
+
+For this reason the xen.ram memory region is expanded, which has no
+further impact as it is used just as a container of the real RAM
+regions and now the grant region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/i386/xen/xen-hvm.c           |  3 +++
+ hw/xen/xen-hvm-common.c         |  4 ++--
+ hw/xen/xen-mapcache.c           | 27 +++++++++++++++++++++++++++
+ include/hw/xen/xen-hvm-common.h |  2 ++
+ include/hw/xen/xen_pvdev.h      |  3 +++
+ include/sysemu/xen-mapcache.h   |  3 +++
+ 6 files changed, 40 insertions(+), 2 deletions(-)
+
+diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
+index f42621e674..67a55558a6 100644
+--- a/hw/i386/xen/xen-hvm.c
++++ b/hw/i386/xen/xen-hvm.c
+@@ -172,6 +172,9 @@ static void xen_ram_init(PCMachineState *pcms,
+                                  x86ms->above_4g_mem_size);
+         memory_region_add_subregion(sysmem, 0x100000000ULL, &ram_hi);
+     }
++
++    /* Add grant mappings as a pseudo RAM region. */
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ static XenPhysmap *get_physmapping(hwaddr start_addr, ram_addr_t size)
+diff --git a/hw/xen/xen-hvm-common.c b/hw/xen/xen-hvm-common.c
+index 565dc39c8f..b7255977a5 100644
+--- a/hw/xen/xen-hvm-common.c
++++ b/hw/xen/xen-hvm-common.c
+@@ -9,7 +9,7 @@
+ #include "hw/boards.h"
+ #include "hw/xen/arch_hvm.h"
+ 
+-MemoryRegion ram_memory;
++MemoryRegion ram_memory, ram_grants;
+ 
+ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+                    Error **errp)
+@@ -26,7 +26,7 @@ void xen_ram_alloc(ram_addr_t ram_addr, ram_addr_t size, MemoryRegion *mr,
+         return;
+     }
+ 
+-    if (mr == &ram_memory) {
++    if (mr == &ram_memory || mr == &ram_grants) {
+         return;
+     }
+ 
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index f7d974677d..8115c44c00 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -14,7 +14,9 @@
+ 
+ #include <sys/resource.h>
+ 
++#include "hw/xen/xen-hvm-common.h"
+ #include "hw/xen/xen_native.h"
++#include "hw/xen/xen_pvdev.h"
+ #include "qemu/bitmap.h"
+ 
+ #include "sysemu/runstate.h"
+@@ -597,3 +599,28 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     mapcache_unlock();
+     return p;
+ }
++
++MemoryRegion *xen_init_grant_ram(void)
++{
++    RAMBlock *block;
++
++    memory_region_init(&ram_grants, NULL, "xen.grants",
++                       XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
++    block = g_malloc0(sizeof(*block));
++    block->mr = &ram_grants;
++    block->used_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->max_length = XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE;
++    block->fd = -1;
++    block->page_size = XC_PAGE_SIZE;
++    block->host = (void *)XEN_GRANT_ADDR_OFF;
++    block->offset = XEN_GRANT_ADDR_OFF;
++    block->flags = RAM_PREALLOC;
++    ram_grants.ram_block = block;
++    ram_grants.ram = true;
++    ram_grants.terminates = true;
++    ram_block_add_list(block);
++    memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
++                                &ram_grants);
++
++    return &ram_grants;
++}
+diff --git a/include/hw/xen/xen-hvm-common.h b/include/hw/xen/xen-hvm-common.h
+index 4e9904f1a6..0d300ba898 100644
+--- a/include/hw/xen/xen-hvm-common.h
++++ b/include/hw/xen/xen-hvm-common.h
+@@ -17,6 +17,8 @@
+ #include <xen/hvm/ioreq.h>
+ 
+ extern MemoryRegion ram_memory;
++
++extern MemoryRegion ram_grants;
+ extern MemoryListener xen_io_listener;
+ extern DeviceListener xen_device_listener;
+ 
+diff --git a/include/hw/xen/xen_pvdev.h b/include/hw/xen/xen_pvdev.h
+index ddad4b9f36..0f1b5edfa9 100644
+--- a/include/hw/xen/xen_pvdev.h
++++ b/include/hw/xen/xen_pvdev.h
+@@ -80,4 +80,7 @@ int xen_pv_send_notify(struct XenLegacyDevice *xendev);
+ void xen_pv_printf(struct XenLegacyDevice *xendev, int msg_level,
+                    const char *fmt, ...)  G_GNUC_PRINTF(3, 4);
+ 
++#define XEN_GRANT_ADDR_OFF    0x8000000000000000ULL
++#define XEN_MAX_VIRTIO_GRANTS 65536
++
+ #endif /* QEMU_HW_XEN_PVDEV_H */
+diff --git a/include/sysemu/xen-mapcache.h b/include/sysemu/xen-mapcache.h
+index c8e7c2f6cf..f4bedb1c11 100644
+--- a/include/sysemu/xen-mapcache.h
++++ b/include/sysemu/xen-mapcache.h
+@@ -10,6 +10,7 @@
+ #define XEN_MAPCACHE_H
+ 
+ #include "exec/cpu-common.h"
++#include "exec/ram_addr.h"
+ 
+ typedef hwaddr (*phys_offset_to_gaddr_t)(hwaddr phys_offset,
+                                          ram_addr_t size);
+@@ -25,6 +26,8 @@ void xen_invalidate_map_cache(void);
+ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+                                  hwaddr new_phys_addr,
+                                  hwaddr size);
++MemoryRegion *xen_init_grant_ram(void);
++
+ #else
+ 
+ static inline void xen_map_cache_init(phys_offset_to_gaddr_t f,
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
new file mode 100644
index 00000000..ee400e2c
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0007-softmmu-let-qemu_map_ram_ptr-use-qemu_ram_ptr_length.patch
@@ -0,0 +1,117 @@
+From 82139e7e4bdcf5ca51b2ac90c63e4af699e3eb6f Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 11:54:48 +0200
+Subject: [PATCH 07/11] softmmu: let qemu_map_ram_ptr() use
+ qemu_ram_ptr_length()
+
+qemu_map_ram_ptr() and qemu_ram_ptr_length() share quite some code, so
+modify qemu_ram_ptr_length() a little bit and use it for
+qemu_map_ram_ptr(), too.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ softmmu/physmem.c | 58 +++++++++++++++++++----------------------------
+ 1 file changed, 23 insertions(+), 35 deletions(-)
+
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index f73629733e..a934e44fe7 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2123,38 +2123,8 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
+ }
+ #endif /* !_WIN32 */
+ 
+-/* Return a host pointer to ram allocated with qemu_ram_alloc.
+- * This should not be used for general purpose DMA.  Use address_space_map
+- * or address_space_rw instead. For local memory (e.g. video ram) that the
+- * device owns, use memory_region_get_ram_ptr.
+- *
+- * Called within RCU critical section.
+- */
+-void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
+-{
+-    RAMBlock *block = ram_block;
+-
+-    if (block == NULL) {
+-        block = qemu_get_ram_block(addr);
+-        addr -= block->offset;
+-    }
+-
+-    if (xen_enabled() && block->host == NULL) {
+-        /* We need to check if the requested address is in the RAM
+-         * because we don't want to map the entire memory in QEMU.
+-         * In that case just map until the end of the page.
+-         */
+-        if (block->offset == 0) {
+-            return xen_map_cache(addr, 0, 0, false);
+-        }
+-
+-        block->host = xen_map_cache(block->offset, block->max_length, 1, false);
+-    }
+-    return ramblock_ptr(block, addr);
+-}
+-
+-/* Return a host pointer to guest's ram. Similar to qemu_map_ram_ptr
+- * but takes a size argument.
++/*
++ * Return a host pointer to guest's ram.
+  *
+  * Called within RCU critical section.
+  */
+@@ -2162,7 +2132,9 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+                                  hwaddr *size, bool lock)
+ {
+     RAMBlock *block = ram_block;
+-    if (*size == 0) {
++    hwaddr len = 0;
++
++    if (size && *size == 0) {
+         return NULL;
+     }
+ 
+@@ -2170,7 +2142,10 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+         block = qemu_get_ram_block(addr);
+         addr -= block->offset;
+     }
+-    *size = MIN(*size, block->max_length - addr);
++    if (size) {
++        *size = MIN(*size, block->max_length - addr);
++        len = *size;
++    }
+ 
+     if (xen_enabled() && block->host == NULL) {
+         /* We need to check if the requested address is in the RAM
+@@ -2178,7 +2153,7 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+          * In that case just map the requested area.
+          */
+         if (block->offset == 0) {
+-            return xen_map_cache(addr, *size, lock, lock);
++            return xen_map_cache(addr, len, lock, lock);
+         }
+ 
+         block->host = xen_map_cache(block->offset, block->max_length, 1, lock);
+@@ -2187,6 +2162,19 @@ static void *qemu_ram_ptr_length(RAMBlock *ram_block, ram_addr_t addr,
+     return ramblock_ptr(block, addr);
+ }
+ 
++/*
++ * Return a host pointer to ram allocated with qemu_ram_alloc.
++ * This should not be used for general purpose DMA.  Use address_space_map
++ * or address_space_rw instead. For local memory (e.g. video ram) that the
++ * device owns, use memory_region_get_ram_ptr.
++ *
++ * Called within RCU critical section.
++ */
++void *qemu_map_ram_ptr(RAMBlock *ram_block, ram_addr_t addr)
++{
++    return qemu_ram_ptr_length(ram_block, addr, NULL, false);
++}
++
+ /* Return the offset of a hostpointer within a ramblock */
+ ram_addr_t qemu_ram_block_host_offset(RAMBlock *rb, void *host)
+ {
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
new file mode 100644
index 00000000..c1e9abd9
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0008-xen-let-xen_ram_addr_from_mapcache-return-1-in-case-.patch
@@ -0,0 +1,49 @@
+From 857bcafe8beb5a0cd78c070f432108049661a56d Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 20 May 2021 13:31:32 +0200
+Subject: [PATCH 08/11] xen: let xen_ram_addr_from_mapcache() return -1 in case
+ of not found entry
+
+Today xen_ram_addr_from_mapcache() will either abort() or return 0 in
+case it can't find a matching entry for a pointer value. Both cases
+are bad, so change that to return an invalid address instead.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/xen/xen-mapcache.c | 12 +++---------
+ 1 file changed, 3 insertions(+), 9 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 8115c44c00..8a61c7dde6 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -404,13 +404,8 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         }
+     }
+     if (!found) {
+-        fprintf(stderr, "%s, could not find %p\n", __func__, ptr);
+-        QTAILQ_FOREACH(reventry, &mapcache->locked_entries, next) {
+-            DPRINTF("   "HWADDR_FMT_plx" -> %p is present\n", reventry->paddr_index,
+-                    reventry->vaddr_req);
+-        }
+-        abort();
+-        return 0;
++        mapcache_unlock();
++        return RAM_ADDR_INVALID;
+     }
+ 
+     entry = &mapcache->entry[paddr_index % mapcache->nr_buckets];
+@@ -418,8 +413,7 @@ ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
+         entry = entry->next;
+     }
+     if (!entry) {
+-        DPRINTF("Trying to find address %p that is not in the mapcache!\n", ptr);
+-        raddr = 0;
++        raddr = RAM_ADDR_INVALID;
+     } else {
+         raddr = (reventry->paddr_index << MCACHE_BUCKET_SHIFT) +
+              ((unsigned long) ptr - (unsigned long) entry->vaddr_base);
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
new file mode 100644
index 00000000..fa18ef16
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0009-memory-add-MemoryRegion-map-and-unmap-callbacks.patch
@@ -0,0 +1,155 @@
+From 364a11be6274336ec9b0f06f3272f964d27c9349 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Thu, 27 May 2021 15:27:55 +0200
+Subject: [PATCH 09/11] memory: add MemoryRegion map and unmap callbacks
+
+In order to support mapping and unmapping guest memory dynamically to
+and from qemu during address_space_[un]map() operations add the map()
+and unmap() callbacks to MemoryRegionOps.
+
+Those will be used e.g. for Xen grant mappings when performing guest
+I/Os.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ include/exec/memory.h | 21 ++++++++++++++++++
+ softmmu/physmem.c     | 50 +++++++++++++++++++++++++++++++++----------
+ 2 files changed, 60 insertions(+), 11 deletions(-)
+
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index 68284428f8..55414417ab 100644
+--- a/include/exec/memory.h
++++ b/include/exec/memory.h
+@@ -274,6 +274,27 @@ struct MemoryRegionOps {
+                                     unsigned size,
+                                     MemTxAttrs attrs);
+ 
++    /*
++     * Dynamically create mapping. @addr is the guest address to map; @plen
++     * is the pointer to the usable length of the buffer.
++     * @mr contents can be changed in case a new memory region is created for
++     * the mapping.
++     * Returns the buffer address for accessing the data.
++     */
++    void *(*map)(MemoryRegion **mr,
++                 hwaddr addr,
++                 hwaddr *plen,
++                 bool is_write,
++                 MemTxAttrs attrs);
++
++    /* Unmap an area obtained via map() before. */
++    void (*unmap)(MemoryRegion *mr,
++                  void *buffer,
++                  ram_addr_t addr,
++                  hwaddr len,
++                  bool is_write,
++                  hwaddr access_len);
++
+     enum device_endian endianness;
+     /* Guest-visible constraints: */
+     struct {
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index a934e44fe7..a1e2030424 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -3070,6 +3070,7 @@ void *address_space_map(AddressSpace *as,
+     hwaddr len = *plen;
+     hwaddr l, xlat;
+     MemoryRegion *mr;
++    void *ptr = NULL;
+     FlatView *fv;
+ 
+     if (len == 0) {
+@@ -3103,12 +3104,20 @@ void *address_space_map(AddressSpace *as,
+         return bounce.buffer;
+     }
+ 
+-
+     memory_region_ref(mr);
++
++    if (mr->ops && mr->ops->map) {
++        ptr = mr->ops->map(&mr, addr, plen, is_write, attrs);
++    }
++
+     *plen = flatview_extend_translation(fv, addr, len, mr, xlat,
+                                         l, is_write, attrs);
+     fuzz_dma_read_cb(addr, *plen, mr);
+-    return qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    if (ptr == NULL) {
++        ptr = qemu_ram_ptr_length(mr->ram_block, xlat, plen, true);
++    }
++
++    return ptr;
+ }
+ 
+ /* Unmaps a memory region previously mapped by address_space_map().
+@@ -3124,11 +3133,16 @@ void address_space_unmap(AddressSpace *as, void *buffer, hwaddr len,
+ 
+         mr = memory_region_from_host(buffer, &addr1);
+         assert(mr != NULL);
+-        if (is_write) {
+-            invalidate_and_set_dirty(mr, addr1, access_len);
+-        }
+-        if (xen_enabled()) {
+-            xen_invalidate_map_cache_entry(buffer);
++
++        if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, buffer, addr1, len, is_write, access_len);
++        } else {
++            if (is_write) {
++                invalidate_and_set_dirty(mr, addr1, access_len);
++            }
++            if (xen_enabled()) {
++                xen_invalidate_map_cache_entry(buffer);
++            }
+         }
+         memory_region_unref(mr);
+         return;
+@@ -3201,10 +3215,18 @@ int64_t address_space_cache_init(MemoryRegionCache *cache,
+          * doing this if we found actual RAM, which behaves the same
+          * regardless of attributes; so UNSPECIFIED is fine.
+          */
++        if (mr->ops && mr->ops->map) {
++            cache->ptr = mr->ops->map(&mr, addr, &l, is_write,
++                                      MEMTXATTRS_UNSPECIFIED);
++        }
++
+         l = flatview_extend_translation(cache->fv, addr, len, mr,
+                                         cache->xlat, l, is_write,
+                                         MEMTXATTRS_UNSPECIFIED);
+-        cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l, true);
++        if (!cache->ptr) {
++            cache->ptr = qemu_ram_ptr_length(mr->ram_block, cache->xlat, &l,
++                                             true);
++        }
+     } else {
+         cache->ptr = NULL;
+     }
+@@ -3226,14 +3248,20 @@ void address_space_cache_invalidate(MemoryRegionCache *cache,
+ 
+ void address_space_cache_destroy(MemoryRegionCache *cache)
+ {
+-    if (!cache->mrs.mr) {
++    MemoryRegion *mr = cache->mrs.mr;
++
++    if (!mr) {
+         return;
+     }
+ 
+-    if (xen_enabled()) {
++    if (mr->ops && mr->ops->unmap) {
++            mr->ops->unmap(mr, cache->ptr, cache->xlat, cache->len,
++                           cache->is_write, cache->len);
++    } else if (xen_enabled()) {
+         xen_invalidate_map_cache_entry(cache->ptr);
+     }
+-    memory_region_unref(cache->mrs.mr);
++
++    memory_region_unref(mr);
+     flatview_unref(cache->fv);
+     cache->mrs.mr = NULL;
+     cache->fv = NULL;
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch
new file mode 100644
index 00000000..48dcf7d7
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0010-xen-add-map-and-unmap-callbacks-for-grant-region.patch
@@ -0,0 +1,262 @@
+From 90496d4c71e3b9334aebca118661bf72631ed0f0 Mon Sep 17 00:00:00 2001
+From: Juergen Gross <jgross@suse.com>
+Date: Fri, 26 Aug 2022 13:57:06 +0200
+Subject: [PATCH 10/11] xen: add map and unmap callbacks for grant region
+
+Add the callbacks for mapping/unmapping guest memory via grants to the
+special grant memory region.
+
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+---
+ hw/xen/xen-mapcache.c | 176 +++++++++++++++++++++++++++++++++++++++++-
+ softmmu/physmem.c     |  11 ++-
+ 2 files changed, 182 insertions(+), 5 deletions(-)
+
+diff --git a/hw/xen/xen-mapcache.c b/hw/xen/xen-mapcache.c
+index 8a61c7dde6..e071328fc5 100644
+--- a/hw/xen/xen-mapcache.c
++++ b/hw/xen/xen-mapcache.c
+@@ -9,6 +9,8 @@
+  */
+ 
+ #include "qemu/osdep.h"
++#include "qemu/queue.h"
++#include "qemu/thread.h"
+ #include "qemu/units.h"
+ #include "qemu/error-report.h"
+ 
+@@ -23,6 +25,8 @@
+ #include "sysemu/xen-mapcache.h"
+ #include "trace.h"
+ 
++#include <xenevtchn.h>
++#include <xengnttab.h>
+ 
+ //#define MAPCACHE_DEBUG
+ 
+@@ -385,7 +389,7 @@ uint8_t *xen_map_cache(hwaddr phys_addr, hwaddr size,
+     return p;
+ }
+ 
+-ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++static ram_addr_t xen_ram_addr_from_mapcache_try(void *ptr)
+ {
+     MapCacheEntry *entry = NULL;
+     MapCacheRev *reventry;
+@@ -594,10 +598,179 @@ uint8_t *xen_replace_cache_entry(hwaddr old_phys_addr,
+     return p;
+ }
+ 
++struct XENMappedGrantRegion {
++    void *addr;
++    unsigned int pages;
++    unsigned int refs;
++    unsigned int prot;
++    uint32_t idx;
++    QLIST_ENTRY(XENMappedGrantRegion) list;
++};
++
++static xengnttab_handle *xen_region_gnttabdev;
++static QLIST_HEAD(GrantRegionList, XENMappedGrantRegion) xen_grant_mappings =
++    QLIST_HEAD_INITIALIZER(xen_grant_mappings);
++static QemuMutex xen_map_mutex;
++
++static void *xen_map_grant_dyn(MemoryRegion **mr, hwaddr addr, hwaddr *plen,
++                               bool is_write, MemTxAttrs attrs)
++{
++    unsigned int page_off = addr & (XC_PAGE_SIZE - 1);
++    unsigned int i;
++    unsigned int total_grants = 0;
++    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 = NULL;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->idx == ref &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++
++        total_grants += mgr->pages;
++    }
++
++    if (!mgr) {
++        if (nrefs + total_grants >= XEN_MAX_VIRTIO_GRANTS) {
++            qemu_mutex_unlock(&xen_map_mutex);
++            return NULL;
++        }
++
++        mgr = g_new(struct XENMappedGrantRegion, 1);
++
++        if (nrefs == 1) {
++            refs = &ref;
++        } else {
++            refs = g_new(uint32_t, nrefs);
++            for (i = 0; i < nrefs; i++) {
++                refs[i] = ref + i;
++            }
++        }
++        mgr->addr = xengnttab_map_domain_grant_refs(xen_region_gnttabdev, nrefs,
++                                                    xen_domid, refs, prot);
++        if (mgr->addr) {
++            mgr->pages = nrefs;
++            mgr->refs = 1;
++            mgr->prot = prot;
++            mgr->idx = ref;
++
++            QLIST_INSERT_HEAD(&xen_grant_mappings, mgr, list);
++        } else {
++            g_free(mgr);
++            mgr = NULL;
++        }
++    } else {
++        mgr->refs++;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    if (nrefs > 1) {
++        g_free(refs);
++    }
++
++    return mgr ? mgr->addr + page_off : NULL;
++}
++
++static void xen_unmap_grant_dyn(MemoryRegion *mr, void *buffer, ram_addr_t addr,
++                                hwaddr len, bool is_write, hwaddr access_len)
++{
++    unsigned int page_off = (unsigned long)buffer & (XC_PAGE_SIZE - 1);
++    unsigned int nrefs = (page_off + len + XC_PAGE_SIZE - 1) >> XC_PAGE_SHIFT;
++    unsigned int prot = PROT_READ;
++    struct XENMappedGrantRegion *mgr = NULL;
++
++    if (is_write) {
++        prot |= PROT_WRITE;
++    }
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == buffer - page_off &&
++            mgr->pages == nrefs &&
++            (mgr->prot & prot) == prot) {
++            break;
++        }
++    }
++    if (mgr) {
++        mgr->refs--;
++        if (!mgr->refs) {
++            xengnttab_unmap(xen_region_gnttabdev, mgr->addr, nrefs);
++
++            QLIST_REMOVE(mgr, list);
++            g_free(mgr);
++        }
++    } else {
++        error_report("xen_unmap_grant_dyn() trying to unmap unknown buffer");
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++}
++
++static ram_addr_t xen_ram_addr_from_grant_cache(void *ptr)
++{
++    unsigned int page_off = (unsigned long)ptr & (XC_PAGE_SIZE - 1);
++    struct XENMappedGrantRegion *mgr = NULL;
++    ram_addr_t raddr = RAM_ADDR_INVALID;
++
++    qemu_mutex_lock(&xen_map_mutex);
++
++    QLIST_FOREACH(mgr, &xen_grant_mappings, list) {
++        if (mgr->addr == ptr - page_off) {
++            break;
++        }
++    }
++
++    if (mgr) {
++        raddr = (mgr->idx << XC_PAGE_SHIFT) + page_off + XEN_GRANT_ADDR_OFF;
++    }
++
++    qemu_mutex_unlock(&xen_map_mutex);
++
++    return raddr;
++}
++
++ram_addr_t xen_ram_addr_from_mapcache(void *ptr)
++{
++    ram_addr_t raddr;
++
++    raddr = xen_ram_addr_from_mapcache_try(ptr);
++    if (raddr == RAM_ADDR_INVALID) {
++        raddr = xen_ram_addr_from_grant_cache(ptr);
++    }
++
++    return raddr;
++}
++
++static const struct MemoryRegionOps xen_grant_mr_ops = {
++    .map = xen_map_grant_dyn,
++    .unmap = xen_unmap_grant_dyn,
++    .endianness = DEVICE_LITTLE_ENDIAN,
++};
++
+ MemoryRegion *xen_init_grant_ram(void)
+ {
+     RAMBlock *block;
+ 
++    qemu_mutex_init(&xen_map_mutex);
++
++    xen_region_gnttabdev = xengnttab_open(NULL, 0);
++    if (xen_region_gnttabdev == NULL) {
++        fprintf(stderr, "can't open gnttab device\n");
++        return NULL;
++    }
++
+     memory_region_init(&ram_grants, NULL, "xen.grants",
+                        XEN_MAX_VIRTIO_GRANTS * XC_PAGE_SIZE);
+     block = g_malloc0(sizeof(*block));
+@@ -612,6 +785,7 @@ MemoryRegion *xen_init_grant_ram(void)
+     ram_grants.ram_block = block;
+     ram_grants.ram = true;
+     ram_grants.terminates = true;
++    ram_grants.ops = &xen_grant_mr_ops;
+     ram_block_add_list(block);
+     memory_region_add_subregion(get_system_memory(), XEN_GRANT_ADDR_OFF,
+                                 &ram_grants);
+diff --git a/softmmu/physmem.c b/softmmu/physmem.c
+index a1e2030424..e1057304f1 100644
+--- a/softmmu/physmem.c
++++ b/softmmu/physmem.c
+@@ -2210,13 +2210,16 @@ RAMBlock *qemu_ram_block_from_host(void *ptr, bool round_offset,
+ 
+     if (xen_enabled()) {
+         ram_addr_t ram_addr;
++
+         RCU_READ_LOCK_GUARD();
+         ram_addr = xen_ram_addr_from_mapcache(ptr);
+-        block = qemu_get_ram_block(ram_addr);
+-        if (block) {
+-            *offset = ram_addr - block->offset;
++        if (ram_addr != RAM_ADDR_INVALID) {
++            block = qemu_get_ram_block(ram_addr);
++            if (block) {
++                *offset = ram_addr - block->offset;
++            }
++            return block;
+         }
+-        return block;
+     }
+ 
+     RCU_READ_LOCK_GUARD();
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch
new file mode 100644
index 00000000..fb5450e6
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-8.1/0011-hw-arm-Add-grant-mapping.patch
@@ -0,0 +1,30 @@
+From b1eaba758a9000061fc53a934c348d6ef8dcdf64 Mon Sep 17 00:00:00 2001
+From: Vikram Garhwal <vikram.garhwal@amd.com>
+Date: Tue, 31 Jan 2023 21:46:43 +0000
+Subject: [PATCH 11/11] hw: arm: Add grant mapping.
+
+Enable grant ram mapping support for Xenpvh machine on ARM.
+
+Signed-off-by: Vikram Garhwal <vikram.garhwal@amd.com>
+Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
+---
+ hw/arm/xen_arm.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c
+index a5631529d0..1587e2a43b 100644
+--- a/hw/arm/xen_arm.c
++++ b/hw/arm/xen_arm.c
+@@ -127,6 +127,9 @@ static void xen_init_ram(MachineState *machine)
+         DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n",
+                 GUEST_RAM1_BASE, ram_size[1]);
+     }
++
++    DPRINTF("init grant ram mapping for XEN\n");
++    ram_grants = *xen_init_grant_ram();
+ }
+ 
+ void arch_handle_ioreq(XenIOState *state, ioreq_t *req)
+-- 
+2.39.2
+
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
new file mode 100644
index 00000000..e84844cf
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-system-native_%.bbappend
@@ -0,0 +1 @@
+require qemu-tpm.inc
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
new file mode 100644
index 00000000..5cb9f0d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_7.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
new file mode 100644
index 00000000..2f8e55aa
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2024%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_8.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target:petalinux = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
new file mode 100644
index 00000000..5cb9f0d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_7.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend
new file mode 100644
index 00000000..95b1902b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_8.1%.bbappend
@@ -0,0 +1,5 @@
+require qemu-tpm.inc
+require qemu-xen_8.1.inc
+
+# We do not want QEMU, on the target to be configured with OpenGL
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
new file mode 100644
index 00000000..135860ab
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch
@@ -0,0 +1,57 @@
+From b300c18ab899b3c899e5405c96c20a32e51d77c8 Mon Sep 17 00:00:00 2001
+From: Bruce Ashfield <bruce.ashfield@windriver.com>
+Date: Mon, 2 Jul 2018 23:10:28 -0400
+Subject: [PATCH] xen: Fix menuconfig and add support for config fragments and
+
+Upstream-Status: Xen: Inappropriate [oe specific, cross compile issue]
+Upstream-Status: Kernel: Pending
+Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
+commit e6972e689a980ab28637e94e48c77eeace6abde5
+
+    xen/kconfig,menuconfig,mconf-cfg: Allow specification of ncurses location
+
+    In some cross build environments such as the Yocto Project build
+    environment it provides an ncurses library that is compiled
+    differently than the host's version.  This causes display corruption
+    problems when the host's curses includes are used instead of the
+    includes from the provided compiler are overridden.  There is a second
+    case where there is no curses libraries at all on the host system and
+    menuconfig will just fail entirely.
+
+    The solution is simply to allow an override variable in
+    check-lxdialog.sh for environments such as the Yocto Project.  Adding
+    a CROSS_CURSES_LIB and CROSS_CURSES_INC solves the issue and allowing
+    compiling and linking against the right headers and libraries.
+
+    Change-Id: Ibe8dfafc90655e3be2671dbbb0cb7f5631fc4d44
+    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+    cc: Michal Marek <mmarek@suse.cz>
+    cc: linux-kbuild@vger.kernel.org
+    Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
+
+---
+ xen/tools/kconfig/mconf-cfg.sh | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ mode change 100755 => 100644 xen/tools/kconfig/mconf-cfg.sh
+
+diff --git a/xen/tools/kconfig/mconf-cfg.sh b/xen/tools/kconfig/mconf-cfg.sh
+old mode 100755
+new mode 100644
+index c812872d7f..56eb4fc79f
+--- a/xen/tools/kconfig/mconf-cfg.sh
++++ b/xen/tools/kconfig/mconf-cfg.sh
+@@ -4,6 +4,14 @@
+ PKG="ncursesw"
+ PKG2="ncurses"
+ 
++if [ "$CROSS_CURSES_LIB" != "" ]; then
++    echo libs=\'$CROSS_CURSES_LIB\'
++    if [ x"$CROSS_CURSES_INC" != x ]; then
++      echo cflags=\'$CROSS_CURSES_INC\'
++    fi
++    exit 0
++fi
++
+ if [ -n "$(command -v pkg-config)" ]; then
+        if pkg-config --exists $PKG; then
+                echo cflags=\"$(pkg-config --cflags $PKG)\"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
new file mode 100644
index 00000000..35cd9a81
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch
@@ -0,0 +1,73 @@
+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: Xen: 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/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
new file mode 100644
index 00000000..7ac1a399
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch
@@ -0,0 +1,43 @@
+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
+ 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
+        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: 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/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch b/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch
new file mode 100644
index 00000000..fa2a82ff
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/files/xen-flask-race-fix.patch
@@ -0,0 +1,54 @@
+From mboxrd@z Thu Jan  1 00:00:00 1970
+From: Anthony PERARD <anthony.perard@citrix.com>
+Subject: [XEN PATCH] build: fix building flask headers before descending in flask/ss/
+Date: Fri, 20 Jan 2023 13:36:26 +0000
+Message-ID: <20230120133626.55680-1-anthony.perard@citrix.com>
+X-Mailer: git-send-email 2.30.2
+MIME-Version: 1.0
+Content-Transfer-Encoding: 8bit
+Content-Type: text/plain
+
+Unfortunatly, adding prerequisite to "$(obj)/ss/built_in.o" doesn't
+work because we have "$(obj)/%/built_in.o: $(obj)/% ;" in Rules.mk.
+So, make is allow to try to build objects in "xsm/flask/ss/" before
+generating the headers.
+
+Adding a prerequisite on "$(obj)/ss" instead will fix the issue has
+that the target used to run make in this subdirectory.
+
+Unfortunatly, that target is also used when running `make clean`, so
+we need to ignore it in this case. $(MAKECMDGOALS) can't be used in
+this case as it is empty, but we can guess which operation is done by
+looking at the list of loaded makefiles.
+
+Upstream-Status: backport [https://lore.kernel.org/xen-devel/20230120133626.55680-1-anthony.perard@citrix.com/T/#u]
+
+Fixes: 7a3bcd2babcc ("build: build everything from the root dir, use obj=$subdir")
+Reported-by: "Daniel P. Smith" <dpsmith@apertussolutions.com>
+Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
+---
+ xen/xsm/flask/Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
+index d25312f4fa..2d24346ee3 100644
+--- a/xen/xsm/flask/Makefile
++++ b/xen/xsm/flask/Makefile
+@@ -16,7 +16,11 @@ FLASK_H_FILES := flask.h class_to_string.h initial_sid_to_string.h
+ AV_H_FILES := av_perm_to_string.h av_permissions.h
+ ALL_H_FILES := $(addprefix include/,$(FLASK_H_FILES) $(AV_H_FILES))
+ 
+-$(addprefix $(obj)/,$(obj-y)) $(obj)/ss/built_in.o: $(addprefix $(obj)/,$(ALL_H_FILES))
++# Adding prerequisite to descending into ss/ folder only when not running `make
++# clean`.
++ifeq ($(filter %/Makefile.clean,$(MAKEFILE_LIST)),)
++$(addprefix $(obj)/,$(obj-y)) $(obj)/ss: $(addprefix $(obj)/,$(ALL_H_FILES))
++endif
+ extra-y += $(ALL_H_FILES)
+ 
+ mkflask := $(srcdir)/policy/mkflask.sh
+-- 
+Anthony PERARD
+
+
+
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc
new file mode 100644
index 00000000..fb0093e3
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-arch.inc
@@ -0,0 +1,18 @@
+
+valid_xen_archs = " \
+        x86_64 x86_32 \
+        arm32 arm64 \
+        "
+
+def map_xen_arch(a, d):
+    import re
+    valid_archs = d.getVar('valid_xen_archs').split()
+
+    if   re.match("i.86", a):        return "x86_32"
+    elif re.match("x86.64", a):      return "x86_64"
+    elif re.match("arm.*", a):       return "arm32"
+    elif re.match("aarch64.*", a):   return "arm64"
+    elif a in valid_archs:           return a
+    else:
+        return "INVALID"
+
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc
new file mode 100644
index 00000000..ad9d5fdb
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-blktap.inc
@@ -0,0 +1,76 @@
+# The Xen block tap components are packaged separately here to support
+# the option to build them in a separate recipe from xen-tools.
+
+BLKTAP_PACKAGES ?= " \
+    ${PN}-blktap \
+    ${PN}-libblktap \
+    ${PN}-libblktapctl \
+    ${PN}-libblktapctl-dev \
+    ${PN}-libblktap-dev \
+    ${PN}-libvhd \
+    ${PN}-libvhd-dev \
+    ${PN}-blktap-staticdev \
+    "
+
+BLKTAP_PROVIDES ?= " \
+    virtual/blktap \
+    virtual/libblktap \
+    virtual/libblktapctl \
+    virtual/libvhd \
+    "
+
+BLKTAP_RRECOMMENDS ?= " \
+    virtual/blktap \
+    virtual/libblktap \
+    virtual/libblktapctl \
+    virtual/libvhd \
+    "
+
+RPROVIDES:${PN}-blktap = "virtual/blktap"
+RPROVIDES:${PN}-libblktap = "virtual/libblktap"
+RPROVIDES:${PN}-libblktapctl = "virtual/libblktapctl"
+RPROVIDES:${PN}-libvhd = "virtual/libvhd"
+
+FILES:${PN}-blktap-staticdev += "\
+    ${libdir}/libblktapctl.a \
+    ${libdir}/libvhd.a \
+    ${libdir}/libblktap.a \
+    "
+
+FILES:${PN}-libblktapctl = "${libdir}/libblktapctl.so.*"
+FILES:${PN}-libblktapctl-dev = " \
+    ${libdir}/libblktapctl.so \
+    ${libdir}/pkgconfig/xenblktapctl.pc \
+    ${datadir}/pkgconfig/xenblktapctl.pc \
+    "
+
+FILES:${PN}-libvhd = "${libdir}/libvhd.so.*"
+FILES:${PN}-libvhd-dev = " \
+    ${libdir}/libvhd.so \
+    ${libdir}/pkgconfig/vhd.pc \
+    ${datadir}/pkgconfig/vhd.pc \
+    "
+
+FILES:${PN}-libblktap = "${libdir}/libblktap.so.*"
+FILES:${PN}-libblktap-dev = " \
+    ${libdir}/libblktap.so \
+    ${libdir}/pkgconfig/blktap.pc \
+    ${datadir}/pkgconfig/blktap.pc \
+    "
+
+FILES:${PN}-blktap = "\
+    ${sbindir}/blktapctrl \
+    ${sbindir}/img2qcow \
+    ${sbindir}/lock-util \
+    ${sbindir}/qcow2raw \
+    ${sbindir}/qcow-create \
+    ${sbindir}/tap-ctl \
+    ${sbindir}/tapdisk \
+    ${sbindir}/tapdisk2 \
+    ${sbindir}/tapdisk-client \
+    ${sbindir}/tapdisk-diff \
+    ${sbindir}/tapdisk-stream \
+    ${sbindir}/td-util \
+    ${sbindir}/vhd-update \
+    ${sbindir}/vhd-util \
+    "
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc
new file mode 100644
index 00000000..6f3d24d0
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-hypervisor.inc
@@ -0,0 +1,117 @@
+SUMMARY = "Xen hypervisor"
+DESCRIPTION = "The Xen hypervisor"
+
+# This recipe is for just the Xen hypervisor.
+# Separate recipes are used to build Xen and its components:
+# this allows for varying the target architecture or toolchain used
+# to build the different components. eg. 32-bit tools and a 64-bit hypervisor.
+
+# The Xen hypervisor has a narrower compatible platform range than the Xen tools
+COMPATIBLE_HOST = '(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
+
+inherit deploy python3native cml1
+
+PACKAGES = " \
+    ${PN} \
+    ${PN}-dbg \
+    ${PN}-efi \
+    "
+
+FILES:${PN} = " \
+    /boot/xen-* \
+    /boot/xen \
+    /boot/xen-*.gz \
+    /boot/xen.gz \
+    /boot/xen-syms-* \
+    "
+
+FILES:${PN}-dbg += "${libdir}/debug/*"
+
+FILES:${PN}-efi = " \
+    /boot/xen.efi \
+    ${exec_prefix}/lib64/efi/xen* \
+    "
+
+do_configure() {
+    do_configure_common
+
+    # Handle the config fragments
+    cfgs="${@' '.join(find_cfgs(d))}"
+    if [ -n "${cfgs}" ]; then
+        # If .config is not present generate one in order
+        # to use the merge_config.sh
+        if [ ! -f "${S}/xen/.config" ] ; then
+            oe_runmake -C ${S}/xen defconfig
+        fi
+        ${S}/xen/tools/kconfig/merge_config.sh -m -O \
+            ${S}/xen ${S}/xen/.config "${cfgs}"
+    fi
+}
+
+# The hypervisor binary for arm must not be built with the hard floating point
+# ABI. Override CC and CPP when invoking make so that they do not contain
+# TUNE_CCARGS.
+EXTRA_OEMAKE:arm += "CC='${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} \
+                         ${CC_REPRODUCIBLE_OPTIONS}' \
+                     CPP='${CCACHE}${HOST_PREFIX}gcc -E ${TOOLCHAIN_OPTIONS} \
+                         ${CC_REPRODUCIBLE_OPTIONS}'"
+
+do_compile() {
+    oe_runmake xen PYTHON="${PYTHON}" \
+                   EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}"
+}
+
+do_install() {
+    oe_runmake DESTDIR="${D}" install-xen
+}
+# The do_install also ships files in /boot and /usr/lib64
+SYSROOT_DIRS += "/boot ${exec_prefix}/lib64"
+
+do_deploy() {
+    install -d ${DEPLOYDIR}
+
+    if [ -f ${B}/xen/xen ]; then
+        install -m 0644 ${B}/xen/xen ${DEPLOYDIR}/xen-${MACHINE}
+    fi
+
+    if [ -f ${B}/xen/xen.gz ]; then
+        install -m 0644 ${B}/xen/xen.gz ${DEPLOYDIR}/xen-${MACHINE}.gz
+    fi
+
+    if [ -f ${B}/xen/xen.efi ]; then
+        install -m 0644 ${B}/xen/xen.efi ${DEPLOYDIR}/xen-${MACHINE}.efi
+    fi
+}
+# Scheduling the do_deploy task:
+# - deploy copies files from ${B} that are written during do_compile so must
+#   at least run afer that task has completed
+# - the hypervisor binaries may be included in the image filesystem, so we
+#   must ensure that the binaries deployed match what is staged in the sysroot:
+#   so do_deploy must run after do_populate_sysroot and after do_compile is
+#   also needed for when having rm_work and bitbake needs to re-run do_deploy,
+#   we ensure that the ${B} is re-generated, otherwise the deploy-xen will be
+#   empty
+# - add the task before do_build to ensure that deployment has completed when
+#   the recipe build done stamp is written
+addtask deploy after do_compile do_populate_sysroot before do_build
+# To ensure that a deployed hypervisor has matching tools, add a dependency to
+# make sure that the tools have built and been staged:
+do_deploy[depends] += "xen-tools:do_populate_sysroot"
+# Also ensure anything that the tools recipe needs to deploy, such as a
+# XSM policy file, has been deployed first:
+do_deploy[depends] += "xen-tools:do_deploy"
+
+# Enable use of menuconfig directly from bitbake and also within the devshell
+do_devshell[depends] += "ncurses-native:do_populate_sysroot"
+
+# Pass the native library path for kconfig build when running the do_menuconfig
+# task
+CROSS_CURSES_LIB += "-L${STAGING_LIBDIR_NATIVE}"
+
+# Specify the root dir of the .config file for do_menuconfig and do_diffconfig
+# tasks
+KCONFIG_CONFIG_ROOTDIR = "${S}/xen"
+
+# Xen is setting all CC flags on its own. Make sure that they are not modified
+# for aarch64, e.g. with architecture-specific optimizations.
+TUNE_CCARGS:aarch64=""
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc
new file mode 100644
index 00000000..e7bc8d7e
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools-xilinx.inc
@@ -0,0 +1,25 @@
+# Only include the sysvinit scripts if sysvinit is enabled.
+do_install:append () {
+    if [ -e ${D}/usr/lib/xen/bin/pygrub ]; then
+        sed -i -e '1c#!/usr/bin/env python3' ${D}/usr/lib/xen/bin/pygrub
+    fi
+
+    if [ "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', '', d)}" != 'sysvinit' ]; then
+        rm -f ${D}/etc/init.d/xendomains
+        rm -f ${D}/etc/init.d/xencommons
+        rm -f ${D}/etc/init.d/xendriverdomain
+        rm -f ${D}/etc/init.d/xen-watchdog
+    fi
+}
+
+# If we're in a hybrid configuration, we want to stop the system from
+# running any Xen sysvinit scripts
+# This has a side effect of, on a hybrid system, if the init manager is
+# sysvinit, the user will need to manually enable Xen.
+INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '1', '', d)}"
+
+FILES:${PN} += " \
+    ${libdir}/xen/bin/init-dom0less \
+    ${libdir}/xen/bin/get_overlay \
+    ${libdir}/xen/bin/get_overlay.sh \
+    "
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc
new file mode 100644
index 00000000..f770eec2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools.inc
@@ -0,0 +1,861 @@
+SUMMARY = "Xen hypervisor tools"
+DESCRIPTION = "Tools and utility software for the Xen hypervisor"
+
+COMPATIBLE_HOST = 'i686-.*-linux|(x86_64.*).*-linux|aarch64.*-linux|arm-.*-linux-gnueabi'
+
+inherit setuptools3 update-rc.d systemd deploy
+require xen-blktap.inc
+
+RDEPENDS:${PN} = "\
+    bash perl xz \
+    ${PN}-console \
+    ${PN}-libxenguest \
+    ${PN}-libxenlight \
+    ${PN}-libxenvchan \
+    ${PN}-libxenctrl \
+    ${PN}-libxlutil \
+    ${PN}-libxenstat \
+    ${PN}-libxenstore \
+    ${PN}-libfsimage \
+    ${PN}-fsimage \
+    ${PN}-scripts-block \
+    ${PN}-scripts-network \
+    ${PN}-xen-watchdog \
+    ${PN}-xencommons \
+    ${PN}-xendomains \
+    ${PN}-xenstore \
+    virtual/xenstored \
+    ${PN}-xl \
+    "
+
+RDEPENDS:${PN}-dev = ""
+
+RRECOMMENDS:${PN} = " \
+    qemu \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'seabios ipxe vgabios', '', d)} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_RRECOMMENDS}', d)} \
+    ${PN}-flask \
+    ${PN}-hvmloader \
+    ${PN}-libxenhypfs \
+    ${PN}-shim \
+    ${PN}-ucode \
+    ${PN}-vchan \
+    ${PN}-xenpaging \
+    ${PN}-xenhypfs \
+    "
+
+RDEPENDS:${PN}-devd = " \
+    ${PN}-xl \
+    "
+
+RDEPENDS:${PN}-fsimage = " \
+    libext2fs \
+    "
+
+RDEPENDS:${PN}-misc = " \
+    perl \
+    python3 \
+    ${PN}-xencov \
+    "
+
+RSUGGESTS:${PN}-misc = " \
+    ${PN}-xencons \
+    ${PN}-xenpvnetboot \
+    "
+
+RDEPENDS:${PN}-python = " \
+    python3 \
+    "
+
+RDEPENDS:${PN}-pygrub = " \
+    python3 \
+    ${PN}-python \
+    "
+
+RDEPENDS:${PN}-remus = "bash"
+
+RDEPENDS:${PN}-scripts-block = "\
+    bash \
+    ${PN}-scripts-common \
+    ${PN}-volatiles \
+    "
+
+RDEPENDS:${PN}-scripts-common = "bash"
+
+RDEPENDS:${PN}-scripts-network = "\
+    bash \
+    bridge-utils \
+    ${PN}-scripts-common \
+    ${PN}-volatiles \
+    "
+
+RRECOMMENDS:${PN}-scripts-network = "\
+    ifupdown \
+    "
+
+RSUGGESTS:${PN}-xencov = "${PN}-xencov-split"
+
+RDEPENDS:${PN}-xencommons = "\
+    bash \
+    util-linux-prlimit \
+    ${PN}-console \
+    ${PN}-xenstore \
+    virtual/xenstored \
+    ${PN}-xl \
+    ${PN}-scripts-common \
+    "
+
+RDEPENDS:${PN}-xendomains = "\
+    bash \
+    ${PN}-console \
+    ${PN}-scripts-block \
+    ${PN}-scripts-common \
+    virtual/xenstored \
+    "
+
+RDEPENDS:${PN}-xenhypfs = " \
+    ${PN}-libxenhypfs \
+    "
+
+RDEPENDS:${PN}-xl = "libgcc"
+
+RDEPENDS:${PN}-xenmon = " \
+    python3 \
+    "
+
+RSUGGESTS:${PN}-xentrace = "${PN}-xentrace-format"
+
+RDEPENDS:${PN}-xen-watchdog = "bash"
+
+PACKAGES = " \
+    ${PN} \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_PACKAGES}', d)} \
+    ${PN}-console \
+    ${PN}-cpuid \
+    ${PN}-dbg \
+    ${PN}-dev \
+    ${PN}-devd \
+    ${PN}-doc \
+    ${PN}-flask \
+    ${PN}-flask-tools \
+    ${PN}-fsimage \
+    ${PN}-gdbsx \
+    ${PN}-hvmloader \
+    ${PN}-init-xenstore-dom \
+    ${PN}-kdd \
+    ${PN}-libfsimage \
+    ${PN}-libfsimage-dev \
+    ${PN}-libxencall \
+    ${PN}-libxencall-dev \
+    ${PN}-libxenctrl \
+    ${PN}-libxenctrl-dev \
+    ${PN}-libxendevicemodel \
+    ${PN}-libxendevicemodel-dev \
+    ${PN}-libxenevtchn \
+    ${PN}-libxenevtchn-dev \
+    ${PN}-libxenforeignmemory \
+    ${PN}-libxenforeignmemory-dev \
+    ${PN}-libxengnttab \
+    ${PN}-libxengnttab-dev \
+    ${PN}-libxenguest \
+    ${PN}-libxenguest-dev \
+    ${PN}-libxenhypfs \
+    ${PN}-libxenhypfs-dev \
+    ${PN}-libxenlight \
+    ${PN}-libxenlight-dev \
+    ${PN}-libxenstat \
+    ${PN}-libxenstat-dev \
+    ${PN}-libxenstore \
+    ${PN}-libxenstore-dev \
+    ${PN}-libxentoolcore \
+    ${PN}-libxentoolcore-dev \
+    ${PN}-libxentoollog \
+    ${PN}-libxentoollog-dev \
+    ${PN}-libxenvchan \
+    ${PN}-libxenvchan-dev \
+    ${PN}-libxlutil \
+    ${PN}-libxlutil-dev \
+    ${PN}-livepatch \
+    ${PN}-misc \
+    ${PN}-pygrub \
+    ${PN}-python \
+    ${PN}-remus \
+    ${PN}-scripts-block \
+    ${PN}-scripts-common \
+    ${PN}-scripts-network \
+    ${PN}-shim \
+    ${PN}-staticdev \
+    ${PN}-ucode \
+    ${PN}-vchan \
+    ${PN}-volatiles \
+    ${PN}-xcutils \
+    ${PN}-xencommons \
+    ${PN}-xencov \
+    ${PN}-xend \
+    ${PN}-xend-examples \
+    ${PN}-xendomains \
+    ${PN}-xenhypfs \
+    ${PN}-xenmon \
+    ${PN}-xenpaging \
+    ${PN}-xenpmd \
+    ${PN}-xenstat \
+    ${PN}-xenstore \
+    ${PN}-xenstored \
+    ${PN}-xentrace \
+    ${PN}-xen-watchdog \
+    ${PN}-xl \
+    ${PN}-xl-examples \
+    ${PN}-xm \
+    ${PN}-xm-examples \
+    ${PN}-xen-access \
+    ${PN}-xen-memshare \
+    ${PN}-test \
+    ${PN}-xen-vmtrace \
+    ${PN}-xen-mceinj \
+    "
+
+PROVIDES =+ " \
+    virtual/xenstored \
+    ${@bb.utils.contains('PACKAGECONFIG', 'externalblktap', '', '${BLKTAP_PROVIDES}', d)} \
+    "
+
+# There are multiple implementations of the XenStore daemon, so we use a
+# virtual package to allow for substitution.
+RPROVIDES:${PN}-xenstored = "virtual/xenstored"
+
+FILES:${PN}-dbg += "\
+    ${libdir}/xen/bin/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/site-packages/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/site-packages/xen/lowlevel/.debug \
+    ${libdir}/fs/xfs/.debug \
+    ${libdir}/fs/ufs/.debug \
+    ${libdir}/fs/ext2fs-lib/.debug \
+    ${libdir}/fs/fat/.debug \
+    ${libdir}/fs/zfs/.debug \
+    ${libdir}/fs/reiserfs/.debug \
+    ${libdir}/fs/iso9660/.debug \
+    ${libdir}/fs/**/.debug \
+    ${sbindir}/.debug \
+    ${libdir}exec/.debug \
+    ${libdir}/xen/libexec/.debug \
+    ${bindir}/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/.debug \
+    ${nonarch_libdir}/${PYTHON_DIR}/dist-packages/xen/lowlevel/.debug \
+    "
+
+FILES:${PN}-dev = "\
+    ${includedir} \
+    "
+
+FILES:${PN}-doc = "\
+    ${sysconfdir}/xen/README \
+    ${sysconfdir}/xen/README.incompatibilities \
+    ${datadir}/doc \
+    ${datadir}/man \
+    "
+
+FILES:${PN}-staticdev += "\
+    ${libdir}/libxenguest.a \
+    ${libdir}/libxenlight.a \
+    ${libdir}/libxenvchan.a \
+    ${libdir}/libxenctrl.a \
+    ${libdir}/libxlutil.a \
+    ${libdir}/libxenstat.a \
+    ${libdir}/libxenstore.a \
+    "
+
+FILES:${PN}-libxencall = "${libdir}/libxencall.so.*"
+FILES:${PN}-libxencall-dev = " \
+    ${libdir}/libxencall.so \
+    ${libdir}/pkgconfig/xencall.pc \
+    ${datadir}/pkgconfig/xencall.pc \
+    "
+
+FILES:${PN}-libxenctrl = "${libdir}/libxenctrl.so.*"
+FILES:${PN}-libxenctrl-dev = " \
+    ${libdir}/libxenctrl.so \
+    ${libdir}/pkgconfig/xencontrol.pc \
+    ${datadir}/pkgconfig/xencontrol.pc \
+    "
+
+FILES:${PN}-libxendevicemodel = "${libdir}/libxendevicemodel.so.*"
+FILES:${PN}-libxendevicemodel-dev = " \
+    ${libdir}/libxendevicemodel.so \
+    ${libdir}/pkgconfig/xendevicemodel.pc \
+    ${datadir}/pkgconfig/xendevicemodel.pc \
+    "
+
+FILES:${PN}-libxenevtchn = "${libdir}/libxenevtchn.so.*"
+FILES:${PN}-libxenevtchn-dev = " \
+    ${libdir}/libxenevtchn.so \
+    ${libdir}/pkgconfig/xenevtchn.pc \
+    ${datadir}/pkgconfig/xenevtchn.pc \
+    "
+
+FILES:${PN}-libxenforeignmemory = "${libdir}/libxenforeignmemory.so.*"
+FILES:${PN}-libxenforeignmemory-dev = " \
+    ${libdir}/libxenforeignmemory.so \
+    ${libdir}/pkgconfig/xenforeignmemory.pc \
+    ${datadir}/pkgconfig/xenforeignmemory.pc \
+    "
+
+FILES:${PN}-libxengnttab = "${libdir}/libxengnttab.so.*"
+FILES:${PN}-libxengnttab-dev = " \
+    ${libdir}/libxengnttab.so \
+    ${libdir}/pkgconfig/xengnttab.pc \
+    ${datadir}/pkgconfig/xengnttab.pc \
+    "
+
+FILES:${PN}-libxenguest = "${libdir}/libxenguest.so.*"
+FILES:${PN}-libxenguest-dev = " \
+    ${libdir}/libxenguest.so \
+    ${libdir}/pkgconfig/xenguest.pc \
+    ${datadir}/pkgconfig/xenguest.pc \
+    "
+
+FILES:${PN}-libxenhypfs = "${libdir}/libxenhypfs.so.*"
+FILES:${PN}-libxenhypfs-dev = " \
+    ${libdir}/libxenhypfs.so \
+    ${libdir}/pkgconfig/xenhypfs.pc \
+    "
+
+FILES:${PN}-libxenlight = "${libdir}/libxenlight.so.*"
+FILES:${PN}-libxenlight-dev = " \
+    ${libdir}/libxenlight.so \
+    ${libdir}/pkgconfig/xenlight.pc \
+    ${datadir}/pkgconfig/xenlight.pc \
+    "
+
+FILES:${PN}-libxenstat = "${libdir}/libxenstat.so.*"
+FILES:${PN}-libxenstat-dev = " \
+    ${libdir}/libxenstat.so \
+    ${libdir}/pkgconfig/xenstat.pc \
+    ${datadir}/pkgconfig/xenstat.pc \
+    "
+
+FILES:${PN}-libxenstore = "${libdir}/libxenstore.so.*"
+FILES:${PN}-libxenstore-dev = " \
+    ${libdir}/libxenstore.so \
+    ${libdir}/pkgconfig/xenstore.pc \
+    ${datadir}/pkgconfig/xenstore.pc \
+    "
+
+FILES:${PN}-libxentoolcore = "${libdir}/libxentoolcore.so.*"
+FILES:${PN}-libxentoolcore-dev = " \
+    ${libdir}/libxentoolcore.so \
+    ${libdir}/pkgconfig/xentoolcore.pc \
+    ${datadir}/pkgconfig/xentoolcore.pc \
+    "
+
+FILES:${PN}-libxentoollog = "${libdir}/libxentoollog.so.*"
+FILES:${PN}-libxentoollog-dev = " \
+    ${libdir}/libxentoollog.so \
+    ${libdir}/pkgconfig/xentoollog.pc \
+    ${datadir}/pkgconfig/xentoollog.pc \
+    "
+
+FILES:${PN}-libxenvchan = "${libdir}/libxenvchan.so.*"
+FILES:${PN}-libxenvchan-dev = " \
+    ${libdir}/libxenvchan.so \
+    ${libdir}/pkgconfig/xenvchan.pc \
+    ${datadir}/pkgconfig/xenvchan.pc \
+    "
+
+FILES:${PN}-libxlutil = "${libdir}/libxlutil.so.*"
+FILES:${PN}-libxlutil-dev = " \
+    ${libdir}/libxlutil.so \
+    ${libdir}/pkgconfig/xlutil.pc \
+    ${datadir}/pkgconfig/xlutil.pc \
+    "
+FILES:${PN}-libvhd = "${libdir}/libvhd.so.*"
+FILES:${PN}-libvhd-dev = " \
+    ${libdir}/libvhd.so \
+    ${libdir}/pkgconfig/vhd.pc \
+    ${datadir}/pkgconfig/vhd.pc \
+    "
+
+FILES:${PN}-libfsimage = " \
+    ${libdir}/libfsimage.so.* \
+    ${libdir}/libxenfsimage.so.* \
+    "
+
+FILES:${PN}-libfsimage-dev = " \
+    ${libdir}/libfsimage.so \
+    ${libdir}/libxenfsimage.so \
+    ${libdir}/pkgconfig/fsimage.pc \
+    ${datadir}/pkgconfig/fsimage.pc \
+    ${libdir}/pkgconfig/xenfsimage.pc \
+    ${datadir}/pkgconfig/xenfsimage.pc \
+    "
+
+FILES:${PN}-fsimage = " \
+    ${libdir}/fs/**/[a-z]*fsimage.so \
+    ${libdir}/xenfsimage/**/fsimage.so \
+    "
+
+FILES:${PN}-init-xenstore-dom = "${libdir}/xen/bin/init-xenstore-domain"
+
+FILES:${PN} = "\
+    ${sysconfdir}/xen/auto \
+    ${sysconfdir}/xen/cpupool \
+    ${localstatedir}/xen/dump \
+    "
+
+FILES:${PN}-console = "\
+    ${libdir}/xen/bin/xenconsole \
+    ${sbindir}/xenconsoled \
+    "
+
+FILES:${PN}-cpuid = "\
+    ${bindir}/xen-cpuid \
+    "
+
+FILES:${PN}-devd = "\
+    ${sysconfdir}/init.d/xendriverdomain \
+    ${systemd_unitdir}/system/xendriverdomain.service \
+    "
+
+FILES:${PN}-flask = "\
+    /boot/xenpolicy-* \
+    "
+
+FILES:${PN}-flask-tools = "\
+    ${sbindir}/flask-get-bool \
+    ${sbindir}/flask-getenforce \
+    ${sbindir}/flask-label-pci \
+    ${sbindir}/flask-loadpolicy \
+    ${sbindir}/flask-set-bool \
+    ${sbindir}/flask-setenforce \
+    "
+
+FILES:${PN}-gdbsx = "\
+    ${sbindir}/gdbsx \
+    "
+
+INSANE_SKIP:${PN}-hvmloader = "arch"
+FILES:${PN}-hvmloader = "\
+    ${libdir}/xen/boot/hvmloader \
+    "
+
+FILES:${PN}-kdd = "\
+    ${sbindir}/kdd \
+    ${sbindir}/xen-kdd \
+    "
+
+FILES:${PN}-livepatch += " \
+    ${sbindir}/xen-livepatch \
+    "
+
+FILES:${PN}-misc = "\
+    ${bindir}/xen-detect \
+    ${libdir}/xen/bin/depriv-fd-checker \
+    ${sbindir}/gtracestat \
+    ${sbindir}/gtraceview \
+    ${sbindir}/xen-bugtool \
+    ${sbindir}/xenperf \
+    ${sbindir}/xenpm \
+    ${sbindir}/xsview \
+    ${sbindir}/xen-diag \
+    ${sbindir}/xen-tmem-list-parse \
+    ${sbindir}/xen-python-path \
+    ${sbindir}/xen-ringwatch \
+    ${sbindir}/xen-hptool \
+    ${sbindir}/xen-hvmcrash \
+    ${sbindir}/xen-hvmctx \
+    ${sbindir}/xenlockprof \
+    ${sbindir}/xen-lowmemd \
+    ${sbindir}/xen-mfndump \
+    ${libdir}/xen/bin/verify-stream-v2 \
+    ${libdir}/xen/bin/convert-legacy-stream \
+    "
+
+FILES:${PN}-pygrub = "\
+    ${bindir}/pygrub \
+    ${libdir}/xen/bin/pygrub \
+    "
+
+# Depending on the version of Xen libdir or nonarch libdir is used
+FILES:${PN}-python = "\
+    ${libdir}/${PYTHON_DIR} \
+    ${nonarch_libdir}/${PYTHON_DIR} \
+    "
+
+FILES:${PN}-remus = "\
+    ${sysconfdir}/xen/scripts/remus-netbuf-setup \
+    "
+
+FILES:${PN}-scripts-network = " \
+    ${sysconfdir}/xen/scripts/colo-proxy-setup \
+    ${sysconfdir}/xen/scripts/network-bridge \
+    ${sysconfdir}/xen/scripts/network-nat \
+    ${sysconfdir}/xen/scripts/network-route \
+    ${sysconfdir}/xen/scripts/qemu-ifup \
+    ${sysconfdir}/xen/scripts/vif2 \
+    ${sysconfdir}/xen/scripts/vif-bridge \
+    ${sysconfdir}/xen/scripts/vif-common.sh \
+    ${sysconfdir}/xen/scripts/vif-nat \
+    ${sysconfdir}/xen/scripts/vif-openvswitch \
+    ${sysconfdir}/xen/scripts/vif-route \
+    ${sysconfdir}/xen/scripts/vif-setup \
+    "
+
+FILES:${PN}-scripts-block = " \
+    ${sysconfdir}/xen/scripts/blktap \
+    ${sysconfdir}/xen/scripts/block \
+    ${sysconfdir}/xen/scripts/block-common.sh \
+    ${sysconfdir}/xen/scripts/block-dummy \
+    ${sysconfdir}/xen/scripts/block-enbd \
+    ${sysconfdir}/xen/scripts/block-iscsi \
+    ${sysconfdir}/xen/scripts/block-nbd \
+    ${sysconfdir}/xen/scripts/block-drbd-probe \
+    ${sysconfdir}/xen/scripts/block-tap \
+    ${sysconfdir}/xen/scripts/vscsi \
+    "
+
+FILES:${PN}-scripts-common = " \
+    ${sysconfdir}/xen/scripts/external-device-migrate \
+    ${sysconfdir}/xen/scripts/hotplugpath.sh \
+    ${sysconfdir}/xen/scripts/locking.sh \
+    ${sysconfdir}/xen/scripts/logging.sh \
+    ${sysconfdir}/xen/scripts/xen-hotplug-cleanup \
+    ${sysconfdir}/xen/scripts/xen-hotplug-common.sh \
+    ${sysconfdir}/xen/scripts/xen-network-common.sh \
+    ${sysconfdir}/xen/scripts/xen-script-common.sh \
+    "
+
+INSANE_SKIP:${PN}-shim = "arch"
+FILES:${PN}-shim = " \
+    ${libdir}/xen/boot/xen-shim \
+    "
+
+FILES:${PN}-ucode = "\
+    ${sbindir}/xen-ucode \
+    "
+
+FILES:${PN}-vchan = "\
+    ${bindir}/vchan-socket-proxy \
+    "
+
+FILES:${PN}-volatiles = "\
+    ${sysconfdir}/default/volatiles/99_xen \
+    ${sysconfdir}/tmpfiles.d/xen.conf \
+    "
+
+FILES:${PN}-xcutils = "\
+    ${libdir}/xen/bin/lsevtchn \
+    ${libdir}/xen/bin/readnotes \
+    ${libdir}/xen/bin/xc_restore \
+    ${libdir}/xen/bin/xc_save \
+    "
+
+FILES:${PN}-xencov = "\
+    ${sbindir}/xencov \
+    "
+
+FILES:${PN}-xend-examples = "\
+    ${sysconfdir}/xen/xend-config.sxp \
+    ${sysconfdir}/xen/xend-pci-permissive.sxp \
+    ${sysconfdir}/xen/xend-pci-quirks.sxp \
+    "
+
+FILES:${PN}-xenhypfs = "\
+    ${sbindir}/xenhypfs \
+    "
+
+FILES:${PN}-xenpaging = "\
+    ${libdir}/xen/bin/xenpaging \
+    ${localstatedir}/lib/xen/xenpaging \
+    "
+
+FILES:${PN}-xenpmd = "\
+    ${sbindir}/xenpmd \
+    "
+
+FILES:${PN}-xenstat = "\
+    ${sbindir}/xentop \
+    "
+
+FILES:${PN}-xenstore = "\
+    ${bindir}/xenstore \
+    ${bindir}/xenstore-chmod \
+    ${bindir}/xenstore-control \
+    ${bindir}/xenstore-exists \
+    ${bindir}/xenstore-list \
+    ${bindir}/xenstore-ls \
+    ${bindir}/xenstore-read \
+    ${bindir}/xenstore-rm \
+    ${bindir}/xenstore-watch \
+    ${bindir}/xenstore-write \
+    "
+
+FILES:${PN}-xenstored = "\
+    ${sbindir}/xenstored \
+    ${localstatedir}/lib/xenstored \
+    "
+
+FILES:${PN}-xentrace = "\
+    ${bindir}/xentrace \
+    ${bindir}/xentrace_setsize \
+    ${libdir}/xen/bin/xenctx \
+    ${bindir}/xenalyze \
+    ${sbindir}/xentrace \
+    ${sbindir}/xentrace_setsize \
+    ${sbindir}/xentrace_setmask \
+    "
+
+FILES:${PN}-xen-watchdog = "\
+    ${sbindir}/xenwatchdogd \
+    ${sysconfdir}/init.d/xen-watchdog \
+    ${systemd_unitdir}/system/xen-watchdog.service \
+    "
+
+FILES:${PN}-xl = "\
+    ${sysconfdir}/bash_completion.d/xl.sh \
+    ${sysconfdir}/bash_completion.d/xl \
+    ${sysconfdir}/xen/xl.conf \
+    ${libdir}/xen/bin/libxl-save-helper \
+    ${sbindir}/xl \
+    ${libdir}/xen/bin/xen-init-dom0 \
+    ${libdir}/xen/bin/init-dom0less \
+    "
+
+FILES:${PN}-xl-examples = "\
+    ${sysconfdir}/xen/xlexample.hvm \
+    ${sysconfdir}/xen/xlexample.pvlinux \
+    ${sysconfdir}/xen/xlexample.pvhlinux \
+    "
+
+FILES:${PN}-xm-examples = "\
+    ${sysconfdir}/xen/xmexample1 \
+    ${sysconfdir}/xen/xmexample2 \
+    ${sysconfdir}/xen/xmexample3 \
+    ${sysconfdir}/xen/xmexample.hvm \
+    ${sysconfdir}/xen/xmexample.hvm-stubdom \
+    ${sysconfdir}/xen/xmexample.nbd \
+    ${sysconfdir}/xen/xmexample.pv-grub \
+    ${sysconfdir}/xen/xmexample.vti \
+    "
+
+FILES:${PN}-xenmon = "\
+    ${sbindir}/xenbaked \
+    ${sbindir}/xenmon.py \
+    ${sbindir}/xenmon \
+    "
+
+FILES:${PN}-xm = "\
+    ${sysconfdir}/xen/xm-config.xml \
+    ${datadir}/xen/create.dtd \
+    ${sbindir}/xm \
+    "
+
+FILES:${PN}-xencommons += "\
+    ${nonarch_libdir}/modules-load.d/xen.conf \
+    ${sysconfdir}/default/xencommons \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${sysconfdir}/init.d/xencommons', d)} \
+    ${sysconfdir}/xen/scripts/launch-xenstore \
+    ${systemd_unitdir}/system/proc-xen.mount \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenconsoled.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xen-init-dom0.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/xenstored.service', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/var-lib-xenstored.mount', '', d)} \
+    ${localstatedir} \
+    "
+
+FILES:${PN}-xend += " \
+    ${sysconfdir}/init.d/xend \
+    ${sbindir}/xend \
+    "
+
+FILES:${PN}-xendomains += "\
+    ${libdir}/xen/bin/xendomains \
+    ${sysconfdir}/default/xendomains \
+    ${sysconfdir}/init.d/xendomains \
+    ${sysconfdir}/sysconfig/xendomains \
+    ${systemd_unitdir}/system/xendomains.service \
+    "
+FILES:${PN}-xen-access += "\
+    ${sbindir}/xen-access \
+    "
+
+FILES:${PN}-xen-memshare += "\
+    ${sbindir}/xen-memshare \
+    "
+
+# memshare is only built for x86, so allow empty package for other archs
+ALLOW_EMPTY:${PN}-xen-memshare = "1"
+
+FILES:${PN}-test += "\
+    ${libdir}/xen/bin/test-xenstore \
+    ${libdir}/xen/bin/test-resource \
+    ${libdir}/xen/bin/test-cpu-policy \
+    ${libdir}/xen/bin/test-tsx \
+    ${libdir}/xen/bin/test-paging-mempool \
+    "
+
+# test-xenstore and test-resource currently only exist in 4.16
+# test-cpu-policy and test-tsx only exist in 4.16 for x86
+ALLOW_EMPTY:${PN}-test = "1"
+
+FILES:${PN}-xen-mceinj +="\
+    ${sbindir}/xen-mceinj \
+    "
+
+# xen-mceinj is only built for x86 4.16, so allow empty package
+ALLOW_EMPTY:${PN}-xen-mceinj = "1"
+
+FILES:${PN}-xen-vmtrace +="\
+    ${sbindir}/xen-vmtrace \
+    "
+
+# xen-vmtrace is only built for x86 4.16, so allow empty package
+ALLOW_EMPTY:${PN}-xen-vmtrace = "1"
+
+INSANE_SKIP:${PN} = "already-stripped"
+
+# configure init.d scripts
+INITSCRIPT_PACKAGES = "${PN}-xend ${PN}-xen-watchdog ${PN}-xendomains ${PN}-devd"
+INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '', '${PN}-xencommons', d)}"
+INITSCRIPT_NAME:${PN}-xencommons = "xencommons"
+INITSCRIPT_PARAMS:${PN}-xencommons = "defaults 80"
+INITSCRIPT_NAME:${PN}-xen-watchdog = "xen-watchdog"
+INITSCRIPT_PARAMS:${PN}-xen-watchdog = "defaults 81"
+INITSCRIPT_NAME:${PN}-xend = "xend"
+INITSCRIPT_PARAMS:${PN}-xend = "defaults 82"
+INITSCRIPT_NAME:${PN}-xendomains = "xendomains"
+INITSCRIPT_PARAMS:${PN}-xendomains = "defaults 83"
+INITSCRIPT_NAME:${PN}-devd = "xendriverdomain"
+INITSCRIPT_PARAMS:${PN}-devd = "defaults 82"
+
+# systemd packages
+SYSTEMD_PACKAGES = "${PN}-xen-watchdog ${PN}-xencommons ${PN}-xendomains ${PN}-devd"
+SYSTEMD_SERVICE:${PN}-devd = "xendriverdomain.service"
+SYSTEMD_SERVICE:${PN}-xen-watchdog = "xen-watchdog.service"
+SYSTEMD_SERVICE:${PN}-xencommons = " \
+    proc-xen.mount \
+    xen-qemu-dom0-disk-backend.service \
+    xenconsoled.service \
+    xen-init-dom0.service \
+    xenstored.service \
+    "
+SYSTEMD_SERVICE:${PN}-xendomains = "xendomains.service"
+
+QEMU_ARCH = "i386"
+QEMU_ARCH:aarch64 = "aarch64"
+
+EXTRA_OECONF += " \
+    --with-systemd=${systemd_unitdir}/system \
+    --with-initddir=${INIT_D_DIR} \
+    --with-sysconfig-leaf-dir=default \
+    --with-system-qemu=${bindir}/qemu-system-${QEMU_ARCH} \
+    "
+
+do_configure() {
+    do_configure_common
+}
+
+do_compile() {
+    cd ${S}
+    oe_runmake tools PYTHON="${PYTHON}" \
+                     EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}"
+}
+
+do_install() {
+    cd ${S}
+    oe_runmake DESTDIR="${D}" install-tools
+
+    # Remove unported python 2 scripts -- see the separate xen-python2 recipe
+    rm -f ${D}${bindir}/xentrace_format \
+          ${D}${bindir}/xencons \
+          ${D}${bindir}/xencov_split \
+          ${D}${libdir}/xen/bin/xenpvnetboot
+
+    # remove installed volatiles
+    rm -rf ${D}${base_prefix}/run \
+        ${D}${localstatedir}/run \
+        ${D}${localstatedir}/lock \
+        ${D}${localstatedir}/log \
+        ${D}${localstatedir}/volatile \
+        ${D}${localstatedir}/lib/xen
+
+    VOLATILE_DIRS=" \
+        ${base_prefix}/run/xenstored \
+        ${base_prefix}/run/xend \
+        ${base_prefix}/run/xend/boot \
+        ${base_prefix}/run/xen \
+        ${localstatedir}/log/xen \
+        ${localstatedir}/lock/xen \
+        ${localstatedir}/lock/subsys \
+        ${localstatedir}/lib/xen \
+        "
+
+    # install volatiles using populate_volatiles mechanism
+    install -d ${D}${sysconfdir}/default/volatiles
+    for i in $VOLATILE_DIRS; do
+        echo "d root root 0755 $i none"  >> ${D}${sysconfdir}/default/volatiles/99_xen
+    done
+
+    # workaround for xendomains script which searchs sysconfig if directory exists
+    install -d ${D}${sysconfdir}/sysconfig
+    ln -sf ${sysconfdir}/default/xendomains ${D}${sysconfdir}/sysconfig/xendomains
+
+    # systemd
+    if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
+        # install volatiles using systemd tmpfiles.d
+        install -d ${D}${sysconfdir}/tmpfiles.d
+        for i in $VOLATILE_DIRS; do
+            echo "d $i 0755 root root - -"  >> ${D}${sysconfdir}/tmpfiles.d/xen.conf
+        done
+    fi
+
+    if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service ]; then
+        sed -i 's#ExecStart=.*qemu-system-i386\(.*\)$#ExecStart=/usr/bin/qemu-system-i386\1#' \
+            ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+    fi
+
+    if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
+        rm -f ${D}/${sysconfdir}/init.d/xencommons
+    else
+        # fixup default path to qemu-system-i386
+        sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=\).*$#\1"/usr/bin/qemu-system-i386"#' ${D}/etc/init.d/xencommons
+
+        # remove the uncondiontally installed systemd service files
+        rm -f ${D}/${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.service
+        rm -f ${D}/${systemd_unitdir}/system/xenconsoled.service
+        rm -f ${D}/${systemd_unitdir}/system/xen-init-dom0.service
+        rm -f ${D}/${systemd_unitdir}/system/xenstored.service
+        rm -f ${D}/${systemd_unitdir}/system/var-lib-xenstored.mount
+    fi
+}
+
+pkg_postinst:${PN}-volatiles() {
+    if [ -z "$D" ]; then
+        if command -v systemd-tmpfiles >/dev/null; then
+            systemd-tmpfiles --create ${sysconfdir}/tmpfiles.d/xen.conf
+        elif [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then
+            ${sysconfdir}/init.d/populate-volatile.sh update
+        fi
+    fi
+}
+
+do_deploy() {
+    XEN_FULLVERSION=$(oe_runmake -C ${S}/xen xenversion --no-print-directory)
+    FLASK_POLICY_FILE="xenpolicy-${XEN_FULLVERSION}"
+
+    install -d ${DEPLOYDIR}
+
+    # Install the flask policy in the deploy directory if it exists
+    if [ -f ${D}/boot/${FLASK_POLICY_FILE} ]; then
+        install -m 0644 ${D}/boot/${FLASK_POLICY_FILE} ${DEPLOYDIR}
+        ln -sf ${FLASK_POLICY_FILE} ${DEPLOYDIR}/xenpolicy-${MACHINE}
+    fi
+}
+# Scheduling the do_deploy task:
+# - deploy copies files from ${D} that are written during do_install so must run
+#   after that task
+# - the tools binaries are included in the image filesystem, so we must ensure
+#   that the binaries deployed match what is staged in the sysroot:
+#   so do_deploy must run after do_populate_sysroot
+# - add the task before do_build to ensure that deployment has completed when
+#   the recipe build done stamp is written
+addtask deploy after do_install do_populate_sysroot before do_build
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
new file mode 100644
index 00000000..acc9184b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bb
@@ -0,0 +1,18 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.15.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
new file mode 100644
index 00000000..d033e1d2
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.17.bbappend
@@ -0,0 +1,2 @@
+require xen-xilinx_4.17.inc
+require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
new file mode 100644
index 00000000..8baa2f53
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bb
@@ -0,0 +1,18 @@
+# tag: RELEASE-4.18.0
+SRCREV ?= "d75f1e9b74314cea91ce435730d4e3539ecca77d"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.18"
+XEN_BRANCH ?= "stable-4.18"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-python-pygrub-pass-DISTUTILS-xen-4.18.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-tools.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
new file mode 100644
index 00000000..86702979
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-tools_4.18.bbappend
@@ -0,0 +1,2 @@
+require xen-xilinx_4.18.inc
+require xen-tools-xilinx.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
new file mode 100644
index 00000000..d7810b27
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.17.inc
@@ -0,0 +1,7 @@
+SRCREV = "38eebc6e5c6f7aa9180672a56d33217bf1ef1ca6"
+XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
+XEN_BRANCH = "xlnx_rebase_4.17"
+
+PV .= "-xilinx+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "+1"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
new file mode 100644
index 00000000..2290a418
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen-xilinx_4.18.inc
@@ -0,0 +1,7 @@
+SRCREV = "7cb7aac7f570757b67bcd43aec67e0cda9f58b14"
+XEN_URI = "git://github.com/Xilinx/xen.git;protocol=https"
+XEN_BRANCH = "xlnx_rebase_4.18"
+
+PV .= "-xilinx+git${SRCPV}"
+
+DEFAULT_PREFERENCE = "+1"
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen.inc b/meta-xilinx-virtualization/recipes-extended/xen/xen.inc
new file mode 100644
index 00000000..5937763a
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen.inc
@@ -0,0 +1,233 @@
+HOMEPAGE = "http://xen.org"
+LICENSE = "GPL-2.0-only"
+SECTION = "console/tools"
+
+inherit autotools-brokensep pkgconfig
+
+require xen-arch.inc
+
+PACKAGECONFIG ??= " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
+    "
+
+PACKAGECONFIG[lzo] = ",,lzo"
+PACKAGECONFIG[xsm] = "--enable-xsmpolicy,--disable-xsmpolicy,checkpolicy-native,"
+PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd,systemd,"
+PACKAGECONFIG[externalblktap] = ",,,"
+
+DEPENDS = " \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', 'dev86-native', '', d)} \
+    bison-native \
+    flex-native \
+    file-native \
+    gettext-native \
+    acpica-native \
+    ncurses-native \
+    util-linux-native \
+    xz-native \
+    bridge-utils \
+    curl \
+    dtc \
+    gettext \
+    glib-2.0 \
+    gnutls \
+    iproute2 \
+    libnl \
+    ncurses \
+    openssl \
+    pciutils \
+    pixman \
+    procps \
+    python3 \
+    libaio \
+    util-linux \
+    xz \
+    yajl \
+    zlib \
+    gnu-efi \
+    "
+
+#### REQUIRED ENVIRONMENT VARIABLES ####
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
+
+# specify xen hypervisor to build/target
+export XEN_TARGET_ARCH = "${@map_xen_arch(d.getVar('TARGET_ARCH'), d)}"
+export XEN_COMPILE_ARCH = "${@map_xen_arch(d.getVar('BUILD_ARCH'), d)}"
+
+python () {
+    if d.getVar('XEN_TARGET_ARCH') == 'INVALID':
+        raise bb.parse.SkipPackage('Cannot map `%s` to a xen architecture' % d.getVar('TARGET_ARCH'))
+}
+
+# Yocto appends ${PN} to libexecdir by default and Xen appends 'xen' as well
+# the result is a nested xen/xen/ so let's avoid that by shunning Yocto's
+# extra ${PN} appended.
+libexecdir = "${libdir}"
+
+# hardcoded as Linux, as the only compatible hosts are Linux.
+export XEN_OS = "Linux"
+
+# this is used for the header (#!${bindir}/python) of the install python scripts
+export PYTHONPATH="${bindir}/env python3"
+export ac_cv_path_PYTHONPATH="${bindir}/env python3"
+export DISTUTILS_BUILD_ARGS
+export DISTUTILS_INSTALL_ARGS
+
+# xen and seabios require HOSTCC and HOSTCXX set to cross-compile
+export HOSTCC="${BUILD_CC}"
+export HOSTCXX="${BUILD_CXX}"
+
+# make xen requires CROSS_COMPILE set by hand as it does not abide by ./configure
+export CROSS_COMPILE="${TARGET_PREFIX}"
+
+# overide LDFLAGS to allow xen to build without: "x86_64-oe-linux-ld: unrecognized option '-Wl,-O1'"
+export LDFLAGS=""
+
+# No additional C flags for the main hypervisor build
+EXTRA_CFLAGS_XEN_CORE ?= ""
+# Add prefix maps to support buildpaths QA test and reproducibility
+DEBUG_PREFIX_MAP:append = " \
+    -ffile-prefix-map=${S}=${PN}-source \
+    -fdebug-prefix-map=${WORKDIR}=${PN} \
+    "
+
+# - The Xen tools build for x86 systems with HVM-mode enabled includes hvmloader
+#   which fails to build when "-m64" is included in flags set via the
+#   EXTRA_CFLAGS_XEN_TOOLS: so clear TUNE_CCARGS on x86 to prevent that.
+TUNE_CCARGS:x86-64=""
+
+# - Yocto supplies the _FORTIFY_SOURCE flag via CC/CPP/CXX but then passes the
+#   optimization -O via C*FLAGS which is problematic when the CFLAGS are cleared
+#   within the build because compilation fails with the compiler stating
+#   "_FORTIFY_SOURCE requires compiling with optimization (-O)".
+# - Move HOST_CC_ARCH into the Xen-provided CFLAGS variables and keep
+#   TOOLCHAIN_OPTIONS set via CC: this enables hvmloader to be built correctly.
+#   It must not be compiled with SSE compiler options enabled and the Xen build
+#   explicitly clears CFLAGS to ensure that, so such options must not be passed
+#   in via the tool variable. hvmloader is required to run HVM-mode guest VMs.
+CC="${CCACHE}${HOST_PREFIX}gcc ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
+EXTRA_CFLAGS_XEN_TOOLS="${HOST_CC_ARCH} ${CFLAGS}"
+# 32-bit ARM needs the TUNE_CCARGS component of HOST_CC_ARCH to be passed
+# in CC to ensure that configure can compile binaries for the right arch.
+CC:arm="${CCACHE}${HOST_PREFIX}gcc ${TUNE_CCARGS} ${TOOLCHAIN_OPTIONS} ${DEBUG_PREFIX_MAP} ${CC_REPRODUCIBLE_OPTIONS}"
+
+# There are no Xen-provided variables for C++, so append to the tool variables:
+CPP:append = " ${CPPFLAGS}"
+CXX:append = " ${CXXFLAGS}"
+
+EXTRA_OECONF += " \
+    --exec-prefix=${prefix} \
+    --prefix=${prefix} \
+    --host=${HOST_SYS} \
+    --disable-stubdom \
+    --disable-ioemu-stubdom \
+    --disable-pv-grub \
+    --disable-xenstore-stubdom \
+    --disable-rombios \
+    --disable-ocamltools \
+    --disable-qemu-traditional \
+    ${@bb.utils.contains('XEN_TARGET_ARCH', 'x86_64', \
+        '--enable-pvshim --with-system-seabios="/usr/share/firmware/bios.bin"', \
+        '--disable-pvshim --disable-seabios', d)} \
+    "
+
+EXTRA_OEMAKE += "STDVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.bin"
+EXTRA_OEMAKE += "CIRRUSVGA_ROM=${STAGING_DIR_HOST}/usr/share/firmware/vgabios-0.8a.cirrus.bin"
+EXTRA_OEMAKE += "SEABIOS_ROM=${STAGING_DIR_HOST}/usr/share/firmware/bios.bin"
+EXTRA_OEMAKE += "ETHERBOOT_ROMS=${STAGING_DIR_HOST}/usr/share/firmware/rtl8139.rom"
+
+# prevent the Xen build scripts from fetching things during the build
+# all dependencies should be reflected in the Yocto recipe
+EXTRA_OEMAKE += "WGET=/bin/false"
+EXTRA_OEMAKE += "GIT=/bin/false"
+
+# Improve build reproducibility: provide values for build variables.
+def get_build_time_vars(d):
+    source_date_epoch = d.getVar('SOURCE_DATE_EPOCH')
+    if source_date_epoch is not None:
+        import datetime
+        utc_datetime = datetime.datetime.utcfromtimestamp(float(source_date_epoch))
+        return " XEN_BUILD_DATE=" + utc_datetime.strftime("%Y-%m-%d") + \
+               " XEN_BUILD_TIME=" + utc_datetime.strftime("%H:%M:%S")
+    return ""
+EXTRA_OEMAKE += "${@['', 'XEN_WHOAMI=${PF} XEN_DOMAIN=${DISTRO} XEN_BUILD_HOST=${PN}-buildhost'] \
+                    [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}${@get_build_time_vars(d)}"
+
+# Improve build reproducibility: compiler flags to remove filesystem differences.
+CC_REPRODUCIBLE_OPTIONS = "${@['', '-gno-record-gcc-switches'] \
+                             [d.getVar('BUILD_REPRODUCIBLE_BINARIES') == '1']}"
+
+# check for XSM in package config to allow XSM_ENABLE to be set
+python () {
+    pkgconfig = d.getVar('PACKAGECONFIG')
+    if ('xsm') in pkgconfig.split():
+        d.setVar('XSM_ENABLED', '1')
+    else:
+        d.setVar('XSM_ENABLED', '0')
+}
+
+do_post_patch() {
+    # fixup AS/CC/CCP/etc variable within StdGNU.mk
+    for i in LD CC CPP CXX; do
+        sed -i "s/^\($i\s\s*\).*=/\1?=/" ${S}/config/StdGNU.mk
+    done
+    # fixup environment passing in some makefiles
+    sed -i 's#\(\w*\)=\(\$.\w*.\)#\1="\2"#' ${S}/tools/firmware/Makefile
+
+    # libsystemd-daemon -> libsystemd for newer systemd versions
+    sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure
+
+    # Improve build reproducibility: disable insertion of the build timestamp
+    # into the x86 EFI hypervisor binary.
+    # binutils should allow a user-supplied timestamp or use SOURCE_DATE_EPOCH
+    # for PE but currently does not.
+    if [ "${BUILD_REPRODUCIBLE_BINARIES}" = "1" ] ; then
+        sed '/^EFI_LDFLAGS = /{a EFI_LDFLAGS += --no-insert-timestamp
+}' -i "${S}/xen/arch/x86/Makefile"
+    fi
+}
+
+addtask post_patch after do_patch before do_configure
+
+# Allow all hypervisor settings in a defconfig
+EXTRA_OEMAKE += "XEN_CONFIG_EXPERT=y"
+# Build release versions always. Technically since we track release
+# tarballs this always happens but occasionally people pull in patches
+# from staging that reverts this
+EXTRA_OEMAKE += "debug=n"
+
+do_configure_common() {
+    cd ${S}
+
+    #./configure --enable-xsmpolicy does not set XSM_ENABLE must be done manually
+    if [ "${XSM_ENABLED}" = "1" ]; then
+        echo "XSM_ENABLE := y" > ${S}/.config
+    fi
+
+    if [ -f "${WORKDIR}/defconfig" ]; then
+        cp "${WORKDIR}/defconfig" "${S}/xen/.config" || \
+        bbfatal "Unable to copy defconfig to .config"
+    fi
+
+    unset CFLAGS
+
+    # do configure
+    oe_runconf EXTRA_CFLAGS_XEN_CORE="${EXTRA_CFLAGS_XEN_CORE}" \
+               EXTRA_CFLAGS_XEN_TOOLS="${EXTRA_CFLAGS_XEN_TOOLS}" \
+               PYTHON="${PYTHON}"
+}
+
+do_compile:prepend() {
+    # workaround for build bug when CFLAGS is exported
+    # https://www.mail-archive.com/xen-devel@lists.xen.org/msg67822.html
+    unset CFLAGS
+}
+
+do_install:prepend() {
+    # CFLAGS is used to set PY_CFLAGS which affects the pygrub install
+    # so also need to unset CFLAGS here:
+    unset CFLAGS
+}
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
new file mode 100644
index 00000000..41cf2a15
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bb
@@ -0,0 +1,19 @@
+# xen 4.17.0 release sha
+SRCREV ?= "11560248ffda3f00f20bbdf3ae088af474f7f2a3"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.17"
+XEN_BRANCH ?= "stable-${XEN_REL}"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    file://xen-flask-race-fix.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
new file mode 100644
index 00000000..a569a96d
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.17.bbappend
@@ -0,0 +1,20 @@
+require xen-xilinx_4.17.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+RDEPENDS:${PN}-efi += "bash python3"
+
+do_deploy:append() {
+    # Mimic older behavior for compatibility
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
+        ln -s xen-${MACHINE} ${DEPLOYDIR}/xen
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then
+        ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then
+        ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi
+    fi
+}
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
new file mode 100644
index 00000000..daa27b5b
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bb
@@ -0,0 +1,18 @@
+# tag: RELEASE-4.18.0
+SRCREV ?= "7cb7aac7f570757b67bcd43aec67e0cda9f58b14"
+
+XEN_URI ?= "git://xenbits.xen.org/xen.git"
+XEN_REL ?= "4.18"
+XEN_BRANCH ?= "stable-4.18"
+
+SRC_URI = " \
+    ${XEN_URI};branch=${XEN_BRANCH} \
+    file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-location.patch \
+    "
+
+LIC_FILES_CHKSUM ?= "file://COPYING;md5=d1a1e216f80b6d8da95fec897d0dbec9"
+
+S = "${WORKDIR}/git"
+
+require xen.inc
+require xen-hypervisor.inc
diff --git a/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
new file mode 100644
index 00000000..e2c75566
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-extended/xen/xen_4.18.bbappend
@@ -0,0 +1,20 @@
+require xen-xilinx_4.18.inc
+
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
+
+RDEPENDS:${PN}-efi += "bash python3"
+
+do_deploy:append() {
+    # Mimic older behavior for compatibility
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE} ]; then
+        ln -s xen-${MACHINE} ${DEPLOYDIR}/xen
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.gz ]; then
+        ln -s xen-${MACHINE}.gz ${DEPLOYDIR}/xen.gz
+    fi
+
+    if [ -f ${DEPLOYDIR}/xen-${MACHINE}.efi ]; then
+        ln -s xen-${MACHINE}.efi ${DEPLOYDIR}/xen.efi
+    fi
+}
diff --git a/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
new file mode 100644
index 00000000..298b1dc8
--- /dev/null
+++ b/meta-xilinx-virtualization/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -0,0 +1,8 @@
+# See meta-virtualization recipes-graphics/xorg-xserver/xserver-xorg_xen.inc
+
+# We want the configuration to remain optimized, if a user wants the removal
+# behavior, then they can set one of the below using 'glamor' as in the
+# xserver-xorg_xen.inc file.
+XEN_REMOVED_OPENGL_PKGCONFIGS:zynqmp ?= ""
+XEN_REMOVED_OPENGL_PKGCONFIGS:versal ?= ""
+