From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Benoit Canet <benoit@irqsave.net>,
Peter Lieven <pl@kamp.de>, Stefan Hajnoczi <stefanha@redhat.com>,
Liu Yuan <namei.unix@gmail.com>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH v5 02/22] block: Add refcnt in BlockDriverAIOCB
Date: Wed, 10 Sep 2014 13:59:54 +0800 [thread overview]
Message-ID: <1410328814-12560-3-git-send-email-famz@redhat.com> (raw)
In-Reply-To: <1410328814-12560-1-git-send-email-famz@redhat.com>
This will be useful in synchronous cancel emulation with
bdrv_aio_cancel_async.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
block.c | 12 +++++++++++-
include/block/aio.h | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/block.c b/block.c
index d06dd51..c1ee860 100644
--- a/block.c
+++ b/block.c
@@ -4885,13 +4885,23 @@ void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
acb->bs = bs;
acb->cb = cb;
acb->opaque = opaque;
+ acb->refcnt = 1;
return acb;
}
+void qemu_aio_ref(void *p)
+{
+ BlockDriverAIOCB *acb = p;
+ acb->refcnt++;
+}
+
void qemu_aio_release(void *p)
{
BlockDriverAIOCB *acb = p;
- g_slice_free1(acb->aiocb_info->aiocb_size, acb);
+ assert(acb->refcnt > 0);
+ if (--acb->refcnt == 0) {
+ g_slice_free1(acb->aiocb_info->aiocb_size, acb);
+ }
}
/**************************************************************/
diff --git a/include/block/aio.h b/include/block/aio.h
index 4603c0f..2626fc7 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -35,11 +35,13 @@ struct BlockDriverAIOCB {
BlockDriverState *bs;
BlockDriverCompletionFunc *cb;
void *opaque;
+ int refcnt;
};
void *qemu_aio_get(const AIOCBInfo *aiocb_info, BlockDriverState *bs,
BlockDriverCompletionFunc *cb, void *opaque);
void qemu_aio_release(void *p);
+void qemu_aio_ref(void *p);
typedef struct AioHandler AioHandler;
typedef void QEMUBHFunc(void *opaque);
--
1.9.3
next prev parent reply other threads:[~2014-09-10 6:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-10 5:59 [Qemu-devel] [PATCH v5 00/22] block: Asynchronous request cancellation Fam Zheng
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 01/22] ide/ahci: Check for -ECANCELED in aio callbacks Fam Zheng
2014-09-10 5:59 ` Fam Zheng [this message]
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 03/22] block: Add bdrv_aio_cancel_async Fam Zheng
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 04/22] block: Drop bdrv_em_co_aiocb_info.cancel Fam Zheng
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 05/22] block: Convert bdrv_em_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-10 8:20 ` Paolo Bonzini
2014-09-10 9:36 ` Fam Zheng
2014-09-10 9:46 ` Paolo Bonzini
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 06/22] thread-pool: Convert thread_pool_aiocb_info.cancel to cancel_async Fam Zheng
2014-09-10 5:59 ` [Qemu-devel] [PATCH v5 07/22] linux-aio: Convert laio_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 08/22] dma: Convert dma_aiocb_info.cancel " Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 09/22] iscsi: Convert iscsi_aiocb_info.cancel " Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 10/22] archipelago: Drop archipelago_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 11/22] blkdebug: Drop blkdebug_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 12/22] blkverify: Drop blkverify_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 13/22] curl: Drop curl_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 14/22] qed: Drop qed_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 15/22] quorum: fix quorum_aio_cancel() Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 16/22] quorum: Convert quorum_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 17/22] rbd: Drop rbd_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 18/22] sheepdog: Convert sd_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 19/22] win32-aio: Drop win32_aiocb_info.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 20/22] ide: Convert trim_aiocb_info.cancel to .cancel_async Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 21/22] block: Drop AIOCBInfo.cancel Fam Zheng
2014-09-10 6:00 ` [Qemu-devel] [PATCH v5 22/22] block: Rename qemu_aio_release -> qemu_aio_unref Fam Zheng
2014-09-10 9:09 ` [Qemu-devel] [PATCH v5 00/22] block: Asynchronous request cancellation Bin Wu
2014-09-10 9:20 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1410328814-12560-3-git-send-email-famz@redhat.com \
--to=famz@redhat.com \
--cc=benoit@irqsave.net \
--cc=kwolf@redhat.com \
--cc=namei.unix@gmail.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).