From f96e46607cd5afd938402f7242357fb1b502318a Mon Sep 17 00:00:00 2001 From: Xu Raoqing Date: Wed, 3 Dec 2025 09:58:16 +0800 Subject: [PATCH] QEMU update to version 8.2.0-55 Signed-off-by: Xu Raoqing --- CCA-fixed-start-realm-vm-failed.patch | 35 +++++++++++++++++++ qemu.spec | 8 ++++- virtio-balloon-delete-unuse-functions.patch | 37 +++++++++++++++++++++ 3 files changed, 79 insertions(+), 1 deletion(-) create mode 100644 CCA-fixed-start-realm-vm-failed.patch create mode 100644 virtio-balloon-delete-unuse-functions.patch diff --git a/CCA-fixed-start-realm-vm-failed.patch b/CCA-fixed-start-realm-vm-failed.patch new file mode 100644 index 00000000..698fccd0 --- /dev/null +++ b/CCA-fixed-start-realm-vm-failed.patch @@ -0,0 +1,35 @@ +From 854fd9c27d4f9e7e440e12377233661182d4477e Mon Sep 17 00:00:00 2001 +From: Xu Raoqing +Date: Mon, 1 Dec 2025 17:08:09 +0800 +Subject: [PATCH 2/2] CCA:fixed start realm vm failed + +in realm state, the kernel has already disabled modification to most system +registers, but QEMU still momdifies registers that not included in the return +list by default, which triggers an assertion. + +fixed:05c35d0d6e7b(arm/kvm: write back modified ID regs to KVM) +Reference:https://gitee.com/openeuler/qemu/commit/05c35d0d6e7b778563e1aa4f624f8472c814e285 + +Signed-off-by: Xu Raoqing +--- + target/arm/kvm64.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c +index 7614194998..2a54318391 100644 +--- a/target/arm/kvm64.c ++++ b/target/arm/kvm64.c +@@ -908,6 +908,10 @@ int kvm_arch_init_vcpu(CPUState *cs) + if (ret) { + return ret; + } ++ ++ if (cpu->kvm_rme) { ++ return 0; ++ } + /* overwrite writable ID regs with their updated property values */ + kvm_arm_writable_idregs_to_cpreg_list(cpu); + +-- +2.43.0 + diff --git a/qemu.spec b/qemu.spec index f1a0b02f..6e668e92 100644 --- a/qemu.spec +++ b/qemu.spec @@ -3,7 +3,7 @@ Name: qemu Version: 8.2.0 -Release: 54 +Release: 55 Epoch: 11 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -1207,6 +1207,8 @@ Patch1190: Migration-urma-fix-small-bugs-during-socket-parse.patch Patch1191: ub-fix-build-faild-if-target-arch-not-aarch64.patch Patch1192: system-hugepage-use-on-demand-only-use-in-aarch64.patch Patch1193: ub-fix-qtest-bios-tables-test-failed-not-build-on-aa.patch +Patch1194: virtio-balloon-delete-unuse-functions.patch +Patch1195: CCA-fixed-start-realm-vm-failed.patch BuildRequires: flex BuildRequires: gcc @@ -1980,6 +1982,10 @@ getent passwd qemu >/dev/null || \ /bin/systemctl try-restart systemd-binfmt.service &>/dev/null || : %changelog +* Wed Dec 3 2025 Xu Raoqing - 11:8.2.0-55 +- virtio-balloon: delete unuse functions +- CCA:fixed start realm vm failed + * Thu Nov 27 2025 Pengrui Zhang - 11:8.2.0-54 - Add BuildRequires umdk-urma-devel ifarch aarch64 - system: add support of hugepage use on demand diff --git a/virtio-balloon-delete-unuse-functions.patch b/virtio-balloon-delete-unuse-functions.patch new file mode 100644 index 00000000..6b23f9f2 --- /dev/null +++ b/virtio-balloon-delete-unuse-functions.patch @@ -0,0 +1,37 @@ +From 2a30b41380455d5eb824353d2106151a62c9d9f5 Mon Sep 17 00:00:00 2001 +From: leizongkun +Date: Sat, 29 Nov 2025 16:30:44 +0800 +Subject: [PATCH 1/2] virtio-balloon: delete unuse functions + +Function all_subpages_in_hugepage_freed is not used, should +be deleted. + +Signed-off-by: wangzhigang +Signed-off-by: zhangliang +Signed-off-by: leizongkun +--- + hw/virtio/virtio-balloon.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c +index ce0f3c35b3..643f53722a 100644 +--- a/hw/virtio/virtio-balloon.c ++++ b/hw/virtio/virtio-balloon.c +@@ -129,14 +129,6 @@ static inline void clear_subpages_in_hugepage(GlobalBalloonedPage *gbp, unsigned + } + } + +-static inline bool all_subpages_in_hugepage_freed(GlobalBalloonedPage *gbp, unsigned long hugepage_index) +-{ +- if (hugepage_index * ULONGS_PER_HUGEPAGE < gbp->page_nr) { +- return bitmap_full(&gbp->freed_page_bitmap[hugepage_index * ULONGS_PER_HUGEPAGE], PAGES_IN_HUGEPAGE); +- } +- return false; +-} +- + static void mark_freed_subpage(RAMBlock *rb, ram_addr_t rb_offset) + { + void *base_hva = qemu_ram_get_host_addr(rb); +-- +2.43.0 + -- Gitee