From fb5c5ae80fbd8cbe3eed543aea2b489a2f04418b Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Tue, 16 Nov 2021 17:16:56 +0800 Subject: [PATCH 1/3] virtio-balloon: apply upstream patch. Signed-off-by: Ming Yang --- virtio-balloon-apply-upstream-patch.patch | 31 +++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 virtio-balloon-apply-upstream-patch.patch diff --git a/virtio-balloon-apply-upstream-patch.patch b/virtio-balloon-apply-upstream-patch.patch new file mode 100644 index 0000000..8d8f0d3 --- /dev/null +++ b/virtio-balloon-apply-upstream-patch.patch @@ -0,0 +1,31 @@ +From bcea62f545e85ad55c3e4fa245de58df42df5f28 Mon Sep 17 00:00:00 2001 +From: Ming Yang +Date: Tue, 16 Nov 2021 17:16:56 +0800 +Subject: [PATCH] virtio-balloon: apply upstream patch. + +Signed-off-by: Ming Yang +--- + 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 + -- Gitee From d98f0e9f63d053a4a18386bc6e76e26252af700b Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Mon, 20 Dec 2021 16:28:37 +0800 Subject: [PATCH 2/3] spec: Update patch and changelog with !214 virtio-balloon: apply upstream patch. !214 virtio-balloon: apply upstream patch. Signed-off-by: Chen Qun --- qemu.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qemu.spec b/qemu.spec index fed8970..29ad816 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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 +* Mon Dec 20 2021 Chen Qun +- virtio-balloon: apply upstream patch. + * Wed Oct 27 2021 Chen Qun - fix cve-2020-35504 - fix cve-2020-35505 -- Gitee From 72de16d6d9c7500ffee745343642e19e621c9e0e Mon Sep 17 00:00:00 2001 From: Chen Qun Date: Mon, 20 Dec 2021 16:28:37 +0800 Subject: [PATCH 3/3] spec: Update release version with !214 increase release verison by one Signed-off-by: Chen Qun --- qemu.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu.spec b/qemu.spec index 29ad816..353eab0 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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 -- Gitee