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

!405 [sync] PR-400: Automatically generate code patches with openeuler !214

Browse Source 
Merge pull request !405 from openeuler-sync-bot/sync-pr400-openEuler-20.03-LTS-Next-to-openEuler-20.03-LTS-SP3
This commit is contained in:
openeuler-ci-bot 2021-12-20 12:19:21 +00:00 committed by Gitee
commit beadee95f6
2 changed files with 36 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: 61
Release: 62
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
@ -342,6 +342,7 @@ Patch0329: tftp-check-tftp_input-buffer-size.patch
Patch0330: tftp-introduce-a-header-structure.patch
Patch0331: fix-cve-2020-35504.patch
Patch0332: fix-cve-2020-35505.patch
Patch0333: virtio-balloon-apply-upstream-patch.patch
BuildRequires: flex
BuildRequires: bison
@ -738,6 +739,9 @@ getent passwd qemu >/dev/null || \
%endif
%changelog
* Fri Dec 03 2021 Chen Qun <kuhn.chenqun@huawei.com>
- virtio-balloon: apply upstream patch.
* Wed Oct 27 2021 Chen Qun <kuhn.chenqun@huawei.com>
- fix cve-2020-35504
- fix cve-2020-35505

31
virtio-balloon-apply-upstream-patch.patch Normal file
View File

@ -0,0 +1,31 @@
From bcea62f545e85ad55c3e4fa245de58df42df5f28 Mon Sep 17 00:00:00 2001
From: Ming Yang <yangming73@huawei.com>
Date: Tue, 16 Nov 2021 17:16:56 +0800
Subject: [PATCH] virtio-balloon: apply upstream patch.
Signed-off-by: Ming Yang <yangming73@huawei.com>
---
hw/virtio/virtio-balloon.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 25de154307..ae56c0d906 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -830,6 +830,13 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
}
balloon_stats_destroy_timer(s);
qemu_remove_balloon_handler(s);
+
+ virtio_del_queue(vdev, 0);
+ virtio_del_queue(vdev, 1);
+ virtio_del_queue(vdev, 2);
+ if (s->free_page_vq) {
+ virtio_del_queue(vdev, 3);
+ }
virtio_cleanup(vdev);
}
--
2.27.0