Commit 2f0d8947 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Fam Zheng
Browse files

nvme: simplify plug/unplug 



bdrv_io_plug/bdrv_io_unplug take care of keeping a nesting count,
so change s->plugged to just a bool.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180813144320.12382-2-pbonzini@redhat.com>
Signed-off-by: default avatarFam Zheng <famz@redhat.com>
parent 9582f357

block/nvme.c

+10 −10
Original line number Diff line number Diff line
@@ -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,7 +1110,7 @@ static void nvme_aio_unplug(BlockDriverState *bs) 
    int i;

    BDRVNVMeState *s = bs->opaque;

    assert(s->plugged);

    if (!--s->plugged) {

    s->plugged = false;

    for (i = 1; i < s->nr_queues; i++) {

        NVMeQueuePair *q = s->queues[i];

        qemu_mutex_lock(&q->lock);
@@ -1118,7 +1119,6 @@ static void nvme_aio_unplug(BlockDriverState *bs) 
        qemu_mutex_unlock(&q->lock);

    }

}

}



static void nvme_register_buf(BlockDriverState *bs, void *host, size_t size)

{