From 25438f2cdb13d07c1bd228fcf4223c21da368548 Mon Sep 17 00:00:00 2001
From: Keqian Zhu <zhukeqian1@huawei.com>
Date: Tue, 26 Mar 2024 15:15:31 +0800
Subject: [PATCH] arm/virt.c: Convey local_err when set psci-conduit

Signed-off-by: Keqian Zhu <zhukeqian1@huawei.com>
---
 hw/arm/virt.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ed437ce0e8..934b0412ef 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2323,7 +2323,10 @@ static void virt_cpu_set_properties(Object *cpuobj, const CPUArchId *cpu_slot,
      */
     if (vms->psci_conduit != QEMU_PSCI_CONDUIT_DISABLED) {
         object_property_set_int(cpuobj, "psci-conduit", vms->psci_conduit,
-                                NULL);
+                                &local_err);
+        if (local_err) {
+            goto out;
+        }
 
         /* Secondary CPUs start in PSCI powered-down state */
         if (CPU(cpuobj)->cpu_index > 0) {
-- 
2.27.0