!968 QEMU update to version 6.2.0-95

From: @liu-pingwei 
Reviewed-by: @aven6 
Signed-off-by: @aven6

cvm-bug-fix-for-disable-DTB-randomness-for-confident.patch

@@ -0,0 +1,40 @@
+From 892657386e36e72395c23cec61457dfa0e1bb8f4 Mon Sep 17 00:00:00 2001
+From: liupingwei <liupingwei0317@outlook.com>
+Date: Wed, 19 Jun 2024 17:43:35 +0800
+Subject: [PATCH] cvm: bug-fix for disable DTB randomness for confidential VMs
+
+The previous condition relied on virtcca_cvm_enabled,which was not
+initialized in time.
+Now,we directly check the KVM type and disable DTB randomness if the
+type is "cvm".
+
+Fixes:2830db7bec600915e88bb22847a66d99b047a308("hw/arm/virt:Disable DTB
+randomness for confidential VMs")
+
+Signed-off-by: liupingwei <liupingwei0317@outlook.com>
+---
+ hw/arm/virt.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/hw/arm/virt.c b/hw/arm/virt.c
+index e0de08e2c1..dc119732f0 100644
+--- a/hw/arm/virt.c
++++ b/hw/arm/virt.c
+@@ -261,7 +261,13 @@ static void create_fdt(VirtMachineState *vms)
+ 
+     /* /chosen must exist for load_dtb to fill in necessary properties later */
+     qemu_fdt_add_subnode(fdt, "/chosen");
+-    if (!virtcca_cvm_enabled()) {
++
++    g_autofree char *kvm_type = NULL;
++    if (object_property_find(OBJECT(current_machine), "kvm-type")) {
++        kvm_type = object_property_get_str(OBJECT(current_machine),
++                                           "kvm-type", &error_abort);
++    }
++    if (!(kvm_type && !strcmp(kvm_type, "cvm"))) {
+         create_kaslr_seed(ms, "/chosen");
+     }
+ 
+-- 
+2.31.1.windows.1
+

qemu.spec

@@ -3,7 +3,7 @@
 
 Name: qemu
 Version: 6.2.0
-Release: 94
+Release: 95
 Epoch: 10
 Summary: QEMU is a generic and open source machine emulator and virtualizer
 License: GPLv2 and BSD and MIT and CC-BY-SA-4.0
@@ -969,6 +969,7 @@ Patch0954: hw-ide-reset-cancel-async-DMA-operation-before-reset.patch
 Patch0955: tests-qtest-ahci-test-add-test-exposing-reset-issue-.patch
 Patch0956: cvm-bug-fix-for-macro-isolation.patch
 Patch0957: hw-arm-virt-Disable-DTB-randomness-for-confidential-.patch
+Patch0958: cvm-bug-fix-for-disable-DTB-randomness-for-confident.patch
 
 BuildRequires: flex
 BuildRequires: gcc
@@ -1567,6 +1568,9 @@ getent passwd qemu >/dev/null || \
 %endif
 
 %changelog
+* Fri Jun 21 2024 <liupingwei@huawei.com> - 10:6.2.0-95
+- cvm: bug-fix for disable DTB randomness for confidential VMs
+
 * Tue Jun 18 2024 <liupingwei@huawei.com> - 10:6.2.0-94
 - hw/arm/virt: Disable DTB randomness for confidential VMs