From f2ed1a2c937aaa54d1cc98b00841943d48ce41ea Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Tue, 26 Mar 2024 18:31:47 -0600 Subject: qemu: Remove versions older then 8.1, no longer compatible Versions older then 8.1 are no longer compatible with the runqemu. Signed-off-by: Mark Hatle --- ...tialize-RAM-and-add-hi-low-memory-regions.patch | 105 --------------------- 1 file changed, 105 deletions(-) delete mode 100644 meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch (limited to '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-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 deleted file mode 100644 index 7c2b272d..00000000 --- a/meta-xilinx-virtualization/recipes-devtools/qemu/qemu-xilinx-7.1/0015-xen_arm-Initialize-RAM-and-add-hi-low-memory-regions.patch +++ /dev/null @@ -1,105 +0,0 @@ -From a284a53c5374e19ac37b884f2dd50293e7c8070e Mon Sep 17 00:00:00 2001 -From: Oleksandr Tyshchenko -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 -Signed-off-by: Vikram Garhwal -Reviewed-by: Stefano Stabellini ---- - 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 - -- cgit v1.2.3-54-g00ecf