packages/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!369 Automatically generate code patches with openeuler !192

Browse Source 
From: @kuhnchen18
Reviewed-by: @imxcc
Signed-off-by: @imxcc
This commit is contained in:
openeuler-ci-bot 2021-09-09 01:20:10 +00:00 committed by Gitee
commit a0baaba962
2 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu.spec
View File

@ -1,6 +1,6 @@
Name: qemu
Version: 4.1.0
Release: 79
Release: 80
Epoch: 2
Summary: QEMU is a generic and open source machine emulator and virtualizer
License: GPLv2 and BSD and MIT and CC-BY-SA-4.0
@ -556,6 +556,7 @@ Patch0543: vfio-Add-vfio_prereg_listener_log_clear-to-re-enable.patch
Patch0544: vfio-Add-vfio_prereg_listener_global_log_start-stop-.patch
Patch0545: hw-arm-smmuv3-Post-load-stage-1-configurations-to-th.patch
Patch0546: usbredir-fix-free-call.patch
Patch0547: vfio-common-Fix-incorrect-address-alignment-in-vfio_.patch
BuildRequires: flex
BuildRequires: gcc
@ -960,6 +961,9 @@ getent passwd qemu >/dev/null || \
%endif
%changelog
* Wed Sep 08 2021 Chen Qun <kuhn.chenqun@huawei.com>
- vfio/common: Fix incorrect address alignment in vfio_dma_map_ram_section
* Mon Aug 30 2021 Zhongrui Tang <tangzhongrui@cmss.chinamobile.com>
- qemu.spec: Specify the package version of zstd and zstd-devel that qemu depends on.

40
vfio-common-Fix-incorrect-address-alignment-in-vfio_.patch Normal file
View File

@ -0,0 +1,40 @@
From 7438519f5cfb0e07dd54f242901761da87f1156c Mon Sep 17 00:00:00 2001
From: Kunkun Jiang <jiangkunkun@huawei.com>
Date: Tue, 7 Sep 2021 15:14:12 +0800
Subject: [PATCH] vfio/common: Fix incorrect address alignment in
vfio_dma_map_ram_section
The 'iova' will be passed to host kernel for mapping with the
HPA. It is related to the host page size. So TARGET_PAGE_ALIGN
should be replaced by REAL_HOST_PAGE_ALIGN. In the case of
large granularity (64K), it may return early when map MMIO RAM
section. And because of the inconsistency with
vfio_dma_unmap_ram_section, it may cause 'assert(qrange)'
in vfio_dma_unmap.
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
Signed-off-by: Zenghui Yu <yuzenghui@huawei.com>
---
hw/vfio/common.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index fb7ca63748..de166dd5f9 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -846,10 +846,10 @@ static int vfio_dma_map_ram_section(VFIOContainer *container,
assert(memory_region_is_ram(section->mr));
- iova = TARGET_PAGE_ALIGN(section->offset_within_address_space);
+ iova = REAL_HOST_PAGE_ALIGN(section->offset_within_address_space);
llend = int128_make64(section->offset_within_address_space);
llend = int128_add(llend, section->size);
- llend = int128_and(llend, int128_exts64(TARGET_PAGE_MASK));
+ llend = int128_and(llend, int128_exts64(qemu_real_host_page_mask));
end = int128_get64(int128_sub(llend, int128_one()));
vaddr = memory_region_get_ram_ptr(section->mr) +
--
2.27.0