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
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
From: Pan Nengyuan <pannengyuan@huawei.com>
|
|
Date: Thu, 5 Dec 2019 11:45:27 +0800
|
|
Subject: block/nbd: extract the common cleanup code
|
|
|
|
Git-commit: 7f493662be4045146a8f45119d8834c9088a0ad6
|
|
|
|
The BDRVNBDState cleanup code is common in two places, add
|
|
nbd_clear_bdrvstate() function to do these cleanups.
|
|
|
|
Suggested-by: Stefano Garzarella <sgarzare@redhat.com>
|
|
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Message-Id: <1575517528-44312-2-git-send-email-pannengyuan@huawei.com>
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
[eblake: fix compilation error and commit message]
|
|
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
|
---
|
|
block/nbd.c | 26 +++++++++++++++-----------
|
|
1 file changed, 15 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/block/nbd.c b/block/nbd.c
|
|
index 5f18f78a9471b25c859bf8d4a743..6bb67152864954bb0e7b6f0145de 100644
|
|
--- a/block/nbd.c
|
|
+++ b/block/nbd.c
|
|
@@ -94,6 +94,19 @@ typedef struct BDRVNBDState {
|
|
|
|
static int nbd_client_connect(BlockDriverState *bs, Error **errp);
|
|
|
|
+static void nbd_clear_bdrvstate(BDRVNBDState *s)
|
|
+{
|
|
+ object_unref(OBJECT(s->tlscreds));
|
|
+ qapi_free_SocketAddress(s->saddr);
|
|
+ s->saddr = NULL;
|
|
+ g_free(s->export);
|
|
+ s->export = NULL;
|
|
+ g_free(s->tlscredsid);
|
|
+ s->tlscredsid = NULL;
|
|
+ g_free(s->x_dirty_bitmap);
|
|
+ s->x_dirty_bitmap = NULL;
|
|
+}
|
|
+
|
|
static void nbd_channel_error(BDRVNBDState *s, int ret)
|
|
{
|
|
if (ret == -EIO) {
|
|
@@ -1864,11 +1877,7 @@ static int nbd_process_options(BlockDriverState *bs, QDict *options,
|
|
|
|
error:
|
|
if (ret < 0) {
|
|
- object_unref(OBJECT(s->tlscreds));
|
|
- qapi_free_SocketAddress(s->saddr);
|
|
- g_free(s->export);
|
|
- g_free(s->tlscredsid);
|
|
- g_free(s->x_dirty_bitmap);
|
|
+ nbd_clear_bdrvstate(s);
|
|
}
|
|
qemu_opts_del(opts);
|
|
return ret;
|
|
@@ -1947,12 +1956,7 @@ static void nbd_close(BlockDriverState *bs)
|
|
BDRVNBDState *s = bs->opaque;
|
|
|
|
nbd_client_close(bs);
|
|
-
|
|
- object_unref(OBJECT(s->tlscreds));
|
|
- qapi_free_SocketAddress(s->saddr);
|
|
- g_free(s->export);
|
|
- g_free(s->tlscredsid);
|
|
- g_free(s->x_dirty_bitmap);
|
|
+ nbd_clear_bdrvstate(s);
|
|
}
|
|
|
|
static int64_t nbd_getlength(BlockDriverState *bs)
|