[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug |
Date: |
Wed, 15 Aug 2018 11:12:35 +0800 |
From: Paolo Bonzini <address@hidden>
bdrv_io_plug/bdrv_io_unplug take care of keeping a nesting count,
so change s->plugged to just a bool.
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
block/nvme.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/block/nvme.c b/block/nvme.c
index 37805e8890..781d77d6d2 100644
--- a/block/nvme.c
+++ b/block/nvme.c
@@ -104,7 +104,7 @@ typedef struct {
uint64_t nsze; /* Namespace size reported by identify command */
int nsid; /* The namespace id to read/write data. */
uint64_t max_transfer;
- int plugged;
+ bool plugged;
CoMutex dma_map_lock;
CoQueue dma_flush_queue;
@@ -1101,7 +1101,8 @@ static void nvme_attach_aio_context(BlockDriverState *bs,
static void nvme_aio_plug(BlockDriverState *bs)
{
BDRVNVMeState *s = bs->opaque;
- s->plugged++;
+ assert(!s->plugged);
+ s->plugged = true;
}
static void nvme_aio_unplug(BlockDriverState *bs)
@@ -1109,14 +1110,13 @@ static void nvme_aio_unplug(BlockDriverState *bs)
int i;
BDRVNVMeState *s = bs->opaque;
assert(s->plugged);
- if (!--s->plugged) {
- for (i = 1; i < s->nr_queues; i++) {
- NVMeQueuePair *q = s->queues[i];
- qemu_mutex_lock(&q->lock);
- nvme_kick(s, q);
- nvme_process_completion(s, q);
- qemu_mutex_unlock(&q->lock);
- }
+ s->plugged = false;
+ for (i = 1; i < s->nr_queues; i++) {
+ NVMeQueuePair *q = s->queues[i];
+ qemu_mutex_lock(&q->lock);
+ nvme_kick(s, q);
+ nvme_process_completion(s, q);
+ qemu_mutex_unlock(&q->lock);
}
}
--
2.17.1
- [Qemu-devel] [PULL 00/17] Block and testing patches, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 01/17] tests/vm: Only use -cpu 'host' if KVM is available, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 02/17] tests/vm: Add flex and bison to the vm image, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 05/17] aio-posix: Don't count ctx->notifier as progress when polling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 04/17] nvme: simplify plug/unplug,
Fam Zheng <=
- [Qemu-devel] [PULL 03/17] nvme: Fix nvme_init error handling, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 06/17] aio: Do aio_notify_accept only during blocking aio_poll, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 09/17] tests: Allow overriding archive path with SRC_ARCHIVE, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 10/17] tests: Add centos VM testing, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 08/17] tests: Add an option for snapshot (default: off), Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 13/17] tests/vm: Propagate V=1 down into the make inside the VM, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 11/17] tests: vm: Add vm-clean-all, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 12/17] tests/vm: Pass the jobs parallelism setting to 'make check', Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 07/17] docker: Install more packages in centos7, Fam Zheng, 2018/08/14
- [Qemu-devel] [PULL 14/17] tests/vm: Bump guest RAM up from 2G to 4G, Fam Zheng, 2018/08/14