405ca57e69
- Include upstream patches targeted for the next stable release (bug fixes only) audio-oss-fix-buffer-pos-calculation.patch blkdebug-Allow-taking-unsharing-permissi.patch block-Add-bdrv_qapi_perm_to_blk_perm.patch block-backup-top-fix-failure-path.patch block-block-copy-fix-progress-calculatio.patch block-fix-crash-on-zero-length-unaligned.patch block-fix-memleaks-in-bdrv_refresh_filen.patch block-Fix-VM-size-field-width-in-snapsho.patch block-nbd-extract-the-common-cleanup-cod.patch block-nbd-fix-memory-leak-in-nbd_open.patch block-qcow2-threads-fix-qcow2_decompress.patch hw-arm-cubieboard-use-ARM-Cortex-A8-as-t.patch hw-intc-arm_gicv3_kvm-Stop-wrongly-progr.patch iotests-add-test-for-backup-top-failure-.patch iotests-Fix-nonportable-use-of-od-endian.patch job-refactor-progress-to-separate-object.patch target-arm-Correct-definition-of-PMCRDP.patch target-arm-fix-TCG-leak-for-fcvt-half-do.patch tpm-ppi-page-align-PPI-RAM.patch vhost-user-blk-delete-virtioqueues-in-un.patch virtio-add-ability-to-delete-vq-through-.patch virtio-crypto-do-delete-ctrl_vq-in-virti.patch virtio-pmem-do-delete-rq_vq-in-virtio_pm.patch - Add Obsoletes directive for qemu-audio-sdl and qemu-ui-sdl since for a qemu package upgrade from SLE12-SP5, support for SDL is dropped OBS-URL: https://build.opensuse.org/request/show/784401 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=534
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From: Pan Nengyuan <pannengyuan@huawei.com>
|
|
Date: Tue, 25 Feb 2020 15:55:53 +0800
|
|
Subject: virtio-pmem: do delete rq_vq in virtio_pmem_unrealize
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 9861546e1dae05c5152de7d3bd14e341ecadc972
|
|
|
|
Similar to other virtio-devices, rq_vq forgot to delete in
|
|
virtio_pmem_unrealize, this patch fix it. This device has already
|
|
maintained a vq pointer, thus we use the new virtio_delete_queue
|
|
function directly to do the cleanup.
|
|
|
|
Reported-by: Euler Robot <euler.robot@huawei.com>
|
|
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
|
|
Message-Id: <20200225075554.10835-4-pannengyuan@huawei.com>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
hw/virtio/virtio-pmem.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/hw/virtio/virtio-pmem.c b/hw/virtio/virtio-pmem.c
|
|
index c0c9395e559cf8b01878549b9f45..cad44fe0fc6231316e86c2317965 100644
|
|
--- a/hw/virtio/virtio-pmem.c
|
|
+++ b/hw/virtio/virtio-pmem.c
|
|
@@ -130,6 +130,7 @@ static void virtio_pmem_unrealize(DeviceState *dev, Error **errp)
|
|
VirtIOPMEM *pmem = VIRTIO_PMEM(dev);
|
|
|
|
host_memory_backend_set_mapped(pmem->memdev, false);
|
|
+ virtio_delete_queue(pmem->rq_vq);
|
|
virtio_cleanup(vdev);
|
|
}
|
|
|