[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/30] arm/virt: don't try to spell out the accelerator
From: |
Peter Maydell |
Subject: |
[PULL 15/30] arm/virt: don't try to spell out the accelerator |
Date: |
Thu, 16 Feb 2023 17:11:08 +0000 |
From: Cornelia Huck <cohuck@redhat.com>
Just use current_accel_name() directly.
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/virt.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 75f28947de0..8d13e4486b1 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2133,21 +2133,21 @@ static void machvirt_init(MachineState *machine)
if (vms->secure && (kvm_enabled() || hvf_enabled())) {
error_report("mach-virt: %s does not support providing "
"Security extensions (TrustZone) to the guest CPU",
- kvm_enabled() ? "KVM" : "HVF");
+ current_accel_name());
exit(1);
}
if (vms->virt && (kvm_enabled() || hvf_enabled())) {
error_report("mach-virt: %s does not support providing "
"Virtualization extensions to the guest CPU",
- kvm_enabled() ? "KVM" : "HVF");
+ current_accel_name());
exit(1);
}
if (vms->mte && (kvm_enabled() || hvf_enabled())) {
error_report("mach-virt: %s does not support providing "
"MTE to the guest CPU",
- kvm_enabled() ? "KVM" : "HVF");
+ current_accel_name());
exit(1);
}
--
2.34.1
- [PULL 04/30] target/arm: Constify ID_PFR1 on user emulation, (continued)
- [PULL 04/30] target/arm: Constify ID_PFR1 on user emulation, Peter Maydell, 2023/02/16
- [PULL 06/30] target/arm: Avoid resetting CPUARMState::eabi field, Peter Maydell, 2023/02/16
- [PULL 07/30] target/arm: Restrict CPUARMState::gicv3state to sysemu, Peter Maydell, 2023/02/16
- [PULL 05/30] target/arm: Convert CPUARMState::eabi to boolean, Peter Maydell, 2023/02/16
- [PULL 08/30] target/arm: Restrict CPUARMState::arm_boot_info to sysemu, Peter Maydell, 2023/02/16
- [PULL 09/30] target/arm: Restrict CPUARMState::nvic to sysemu, Peter Maydell, 2023/02/16
- [PULL 10/30] target/arm: Store CPUARMState::nvic as NVICState*, Peter Maydell, 2023/02/16
- [PULL 11/30] target/arm: Declare CPU <-> NVIC helpers in 'hw/intc/armv7m_nvic.h', Peter Maydell, 2023/02/16
- [PULL 14/30] hw/arm: Add missing XLNX_ZYNQMP_ARM -> USB_DWC3 Kconfig dependency, Peter Maydell, 2023/02/16
- [PULL 12/30] tests/avocado: retire the Aarch64 TCG tests from boot_linux.py, Peter Maydell, 2023/02/16
- [PULL 15/30] arm/virt: don't try to spell out the accelerator,
Peter Maydell <=
- [PULL 13/30] hw/arm/smmuv3: Add GBPA register, Peter Maydell, 2023/02/16
- [PULL 16/30] MAINTAINERS: Add myself to maintainers and remove Havard, Peter Maydell, 2023/02/16
- [PULL 18/30] hw/arm: Attach PSPI module to NPCM7XX SoC, Peter Maydell, 2023/02/16
- [PULL 17/30] hw/ssi: Add Nuvoton PSPI Module, Peter Maydell, 2023/02/16
- [PULL 19/30] hw/arm/smmu-common: Support 64-bit addresses, Peter Maydell, 2023/02/16
- [PULL 20/30] hw/arm/smmu-common: Fix TTB1 handling, Peter Maydell, 2023/02/16
- [PULL 21/30] target/arm: rename handle_semihosting to tcg_handle_semihosting, Peter Maydell, 2023/02/16
- [PULL 22/30] target/arm: wrap psci call with tcg_enabled, Peter Maydell, 2023/02/16
- [PULL 23/30] target/arm: wrap call to aarch64_sve_change_el in tcg_enabled(), Peter Maydell, 2023/02/16
- [PULL 25/30] target/arm: Move cpregs code out of cpu.h, Peter Maydell, 2023/02/16