From 4eccda49693a2c75f906dffda47abbeb4197d12e Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Fri, 19 Jan 2024 13:41:55 -0700 Subject: qemu: Rename qemu-xen to qemu-xen_7.1 Rename qemu-xen to qemu-xen_7.1 inclusion file and update the same in qemu-xilinx_2023 qemu_7.1 recipes. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- ...en-mapcache-move-xen-mapcache.c-to-hw-xen.patch | 88 ++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0002-xen-mapcache-move-xen-mapcache.c-to-hw-xen.patch (limited to '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-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 +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 +Reviewed-by: Stefano Stabellini +Signed-off-by: Stefano Stabellini +--- + 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 + -- cgit v1.2.3-54-g00ecf