aboutsummaryrefslogtreecommitdiffstats
path: root/community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2022-04-20 15:17:38 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2022-04-20 15:33:43 +0200
commit5adbe4930461bef37687ee064aa82533a1bdf3c9 (patch)
tree224dbc4a708f800bd43f50d64d0b25986eee99e4 /community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch
parentf4d03a7ca40a19ccfae035ff519aa9bb1720ea40 (diff)
downloadaports-5adbe4930461bef37687ee064aa82533a1bdf3c9.tar.gz
aports-5adbe4930461bef37687ee064aa82533a1bdf3c9.tar.bz2
aports-5adbe4930461bef37687ee064aa82533a1bdf3c9.tar.xz
community/qemu: upgrade to 7.0.0
Diffstat (limited to 'community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch')
-rw-r--r--community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch58
1 files changed, 0 insertions, 58 deletions
diff --git a/community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch b/community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch
deleted file mode 100644
index d26e130d69..0000000000
--- a/community/qemu/0006-hw-arm-virt-Drop-superfluous-checks-against-highmem.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2dcb74e5c271b9bb581013b949e4ef3bb3f6969b Mon Sep 17 00:00:00 2001
-From: Marc Zyngier <maz@kernel.org>
-Date: Fri, 14 Jan 2022 14:07:41 +0000
-Subject: [PATCH 6/6] hw/arm/virt: Drop superfluous checks against highmem
-
-Now that the devices present in the extended memory map are checked
-against the available PA space and disabled when they don't fit,
-there is no need to keep the same checks against highmem, as
-highmem really is a shortcut for the PA space being 32bit.
-
-Reviewed-by: Eric Auger <eric.auger@redhat.com>
-Signed-off-by: Marc Zyngier <maz@kernel.org>
-Message-id: 20220114140741.1358263-7-maz@kernel.org
-Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
----
- hw/arm/virt-acpi-build.c | 2 --
- hw/arm/virt.c | 5 +----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
-index 0757c28f69..449fab0080 100644
---- a/hw/arm/virt-acpi-build.c
-+++ b/hw/arm/virt-acpi-build.c
-@@ -947,8 +947,6 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables)
- acpi_add_table(table_offsets, tables_blob);
- build_fadt_rev5(tables_blob, tables->linker, vms, dsdt);
-
-- vms->highmem_redists &= vms->highmem;
--
- acpi_add_table(table_offsets, tables_blob);
- build_madt(tables_blob, tables->linker, vms);
-
-diff --git a/hw/arm/virt.c b/hw/arm/virt.c
-index 8d02c2267d..141350bf21 100644
---- a/hw/arm/virt.c
-+++ b/hw/arm/virt.c
-@@ -2178,9 +2178,6 @@ static void machvirt_init(MachineState *machine)
-
- virt_flash_fdt(vms, sysmem, secure_sysmem ?: sysmem);
-
-- vms->highmem_mmio &= vms->highmem;
-- vms->highmem_redists &= vms->highmem;
--
- create_gic(vms, sysmem);
-
- virt_cpu_post_init(vms, sysmem);
-@@ -2199,7 +2196,7 @@ static void machvirt_init(MachineState *machine)
- machine->ram_size, "mach-virt.tag");
- }
-
-- vms->highmem_ecam &= vms->highmem && (!firmware_loaded || aarch64);
-+ vms->highmem_ecam &= (!firmware_loaded || aarch64);
-
- create_rtc(vms);
-
---
-2.35.0
-