From 07e397a40e7f33ca980b29ba6c8b6de0c7419991 Mon Sep 17 00:00:00 2001 From: yxk Date: Wed, 20 Aug 2025 03:22:03 +0800 Subject: [PATCH] Bugfix: Correctly set vms->bootinfo.confidential in virtCCA senarios. Both CCA and virtCCA senarios can set vms->bootinfo.confidential in hw/arm/virt.c. Signed-off-by: yxk --- hw/arm/virt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index f12bc645d2..cf4156ed49 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -2930,9 +2930,9 @@ static void machvirt_init(MachineState *machine) vms->bootinfo.firmware_loaded = firmware_loaded; vms->bootinfo.firmware_base = vms->memmap[VIRT_FLASH].base; vms->bootinfo.firmware_max_size = vms->memmap[VIRT_FLASH].size; - vms->bootinfo.confidential = virtcca_cvm_enabled(); vms->bootinfo.psci_conduit = vms->psci_conduit; - vms->bootinfo.confidential = virt_machine_is_confidential(vms); + vms->bootinfo.confidential = virt_machine_is_confidential(vms) || + virtcca_cvm_enabled(); vms->bootinfo.skip_bootloader = vms->bootinfo.confidential; arm_load_kernel(ARM_CPU(first_cpu), machine, &vms->bootinfo); -- Gitee