| Message ID | 20240320083945.991426-14-michael.roth@amd.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add AMD Secure Nested Paging (SEV-SNP) support | expand |
On 3/20/2024 4:39 PM, Michael Roth wrote: > TODO: squash into "kvm: handle KVM_EXIT_MEMORY_FAULT" > > qemu_host_page_size has been superseded by qemu_real_host_page_size() > in newer QEMU, so update the patch accordingly. I found it today as well when rebase to qemu v9.0.0-rc0. Fix it locally, will show up on my next post of TDX-QEMU patches. :) > Signed-off-by: Michael Roth <michael.roth@amd.com> > --- > accel/kvm/kvm-all.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 2fdc07a472..a9c19ab9a1 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -2912,8 +2912,8 @@ static int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) > void *addr; > int ret = -1; > > - if (!QEMU_PTR_IS_ALIGNED(start, qemu_host_page_size) || > - !QEMU_PTR_IS_ALIGNED(size, qemu_host_page_size)) { > + if (!QEMU_PTR_IS_ALIGNED(start, qemu_real_host_page_size()) || > + !QEMU_PTR_IS_ALIGNED(size, qemu_real_host_page_size())) { > return -1; > } > > @@ -2943,7 +2943,7 @@ static int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) > rb = qemu_ram_block_from_host(addr, false, &offset); > > if (to_private) { > - if (rb->page_size != qemu_host_page_size) { > + if (rb->page_size != qemu_real_host_page_size()) { > /* > * shared memory is back'ed by hugetlb, which is supposed to be > * pre-allocated and doesn't need to be discarded
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 2fdc07a472..a9c19ab9a1 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -2912,8 +2912,8 @@ static int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) void *addr; int ret = -1; - if (!QEMU_PTR_IS_ALIGNED(start, qemu_host_page_size) || - !QEMU_PTR_IS_ALIGNED(size, qemu_host_page_size)) { + if (!QEMU_PTR_IS_ALIGNED(start, qemu_real_host_page_size()) || + !QEMU_PTR_IS_ALIGNED(size, qemu_real_host_page_size())) { return -1; } @@ -2943,7 +2943,7 @@ static int kvm_convert_memory(hwaddr start, hwaddr size, bool to_private) rb = qemu_ram_block_from_host(addr, false, &offset); if (to_private) { - if (rb->page_size != qemu_host_page_size) { + if (rb->page_size != qemu_real_host_page_size()) { /* * shared memory is back'ed by hugetlb, which is supposed to be * pre-allocated and doesn't need to be discarded
TODO: squash into "kvm: handle KVM_EXIT_MEMORY_FAULT" qemu_host_page_size has been superseded by qemu_real_host_page_size() in newer QEMU, so update the patch accordingly. Signed-off-by: Michael Roth <michael.roth@amd.com> --- accel/kvm/kvm-all.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)