28 files changed, 6 insertions, 6 deletions

diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen.inc b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
index 6d1cd1eb..1210a3de 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen.inc
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xen_7.1.inc
@@ -1,4 +1,4 @@
-# Xen specific changes are only applicable on the target
+# 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 \
@@ -28,6 +28,6 @@ SRC_URI_XEN:class-target = " \
           file://0008-hw-arm-Add-grant-mapping.patch \
           "
 
-FILESEXTRAPATHS:prepend:class-target := "${THISDIR}/qemu:"
+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/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
index 99eaeeaf..99eaeeaf 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 71dfb3be..71dfb3be 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index d4349b1d..d4349b1d 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 8facb189..8facb189 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 35ca6df4..35ca6df4 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 1113cf39..1113cf39 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index bff815bc..bff815bc 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 4337e0c8..4337e0c8 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 25dc0ae0..25dc0ae0 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index db6d8fe5..db6d8fe5 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 6b56a39e..6b56a39e 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 87bbc3c6..87bbc3c6 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 7df302a2..7df302a2 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 7ff202ff..7ff202ff 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 83a18c08..83a18c08 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 881076fb..881076fb 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 3b83d229..3b83d229 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 1b1aea76..1b1aea76 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index fc979b52..fc979b52 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index dad3029f..dad3029f 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index f80a0873..f80a0873 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 1aa09efb..1aa09efb 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index a6925acf..a6925acf 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 7c2b272d..7c2b272d 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
index 14f2e240..14f2e240 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu/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
diff --git a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
index 3e93710c..5cb9f0d0 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx_2023%.bbappend
@@ -1,5 +1,5 @@
 require qemu-tpm.inc
-require qemu-xen.inc
+require qemu-xen_7.1.inc
 
 # We do not want QEMU, on the target to be configured with OpenGL
-PACKAGECONFIG:remove:class-target:petalinux = "virglrenderer epoxy gtk+"
+PACKAGECONFIG:remove:class-target = "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
index 3e93710c..5cb9f0d0 100644
--- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
+++ b/meta-xilinx-virtualization/recipes-devtools/qemu/qemu_7.1%.bbappend
@@ -1,5 +1,5 @@
 require qemu-tpm.inc
-require qemu-xen.inc
+require qemu-xen_7.1.inc
 
 # We do not want QEMU, on the target to be configured with OpenGL
-PACKAGECONFIG:remove:class-target:petalinux = "virglrenderer epoxy gtk+"
+PACKAGECONFIG:remove:class-target = "virglrenderer epoxy gtk+"