bcf03884b2
- kvm-ram-block-attributes-fix-interaction-with-hugetlb-me.patch [RHEL-126708] - kvm-ram-block-attributes-Unify-the-retrieval-of-the-bloc.patch [RHEL-126708] - kvm-hw-s390x-Fix-a-possible-crash-with-passed-through-vi.patch [RHEL-128085] - kvm-Fix-the-typo-of-vfio-pci-device-s-enable-migration-o.patch [RHEL-130704] - Resolves: RHEL-126708 ([RHEL 10]snp guest fail to boot with hugepage) - Resolves: RHEL-128085 (VM crashes during boot when virtio device is attached through vfio_ccw) - Resolves: RHEL-130704 ([rhel10] Fix the typo under vfio-pci device's enable-migration option )
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 0e0b1ba11faad72338036b9dfa97a3a8a8bc56dc Mon Sep 17 00:00:00 2001
|
|
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Wed, 19 Nov 2025 12:51:32 +0100
|
|
Subject: [PATCH 2/4] ram-block-attributes: Unify the retrieval of the block
|
|
size
|
|
|
|
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
RH-MergeRequest: 426: Fix hugetlb memory backends in confidential VMs
|
|
RH-Jira: RHEL-126708
|
|
RH-Acked-by: Bandan Das <bdas@redhat.com>
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Acked-by: Peter Xu <peterx@redhat.com>
|
|
RH-Commit: [2/2] 0d6f2045a97f04348c4d07ef331e42f47eaba160 (bonzini/qemu-kvm-centos)
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-126708
|
|
|
|
There's an existing helper function designed to obtain the block size.
|
|
Modify ram_block_attribute_create() to use this function for
|
|
consistency.
|
|
|
|
Tested-by: Farrah Chen <farrah.chen@intel.com>
|
|
Signed-off-by: Chenyi Qiang <chenyi.qiang@intel.com>
|
|
Link: https://lore.kernel.org/r/20251023095526.48365-3-chenyi.qiang@intel.com
|
|
[peterx: fix double spaces, per david]
|
|
Signed-off-by: Peter Xu <peterx@redhat.com>
|
|
(cherry picked from commit b2ceb87b1a210d91a29d525590eb164d1121b8a1)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
system/ram-block-attributes.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/system/ram-block-attributes.c b/system/ram-block-attributes.c
|
|
index a7579de5b4..fb7c5c2746 100644
|
|
--- a/system/ram-block-attributes.c
|
|
+++ b/system/ram-block-attributes.c
|
|
@@ -390,7 +390,7 @@ int ram_block_attributes_state_change(RamBlockAttributes *attr,
|
|
|
|
RamBlockAttributes *ram_block_attributes_create(RAMBlock *ram_block)
|
|
{
|
|
- const int block_size = qemu_real_host_page_size();
|
|
+ const int block_size = ram_block_attributes_get_block_size();
|
|
RamBlockAttributes *attr;
|
|
MemoryRegion *mr = ram_block->mr;
|
|
|
|
--
|
|
2.47.3
|
|
|