Commit 008a51bb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/famz/tags/staging-pull-request' into staging 



# gpg: Signature made Thu 08 Feb 2018 01:29:22 GMT
# gpg:                using RSA key CA35624C6A9171C6
# gpg: Good signature from "Fam Zheng <famz@redhat.com>"
# Primary key fingerprint: 5003 7CB7 9706 0F76 F021  AD56 CA35 624C 6A91 71C6

* remotes/famz/tags/staging-pull-request:
  docs: Add docs/devel/testing.rst
  qapi: Add NVMe driver options to the schema
  docs: Add section for NVMe VFIO driver
  block: Move NVMe constants to a separate header
  qemu-img: Map bench buffer
  block/nvme: Implement .bdrv_(un)register_buf
  block: Introduce buf register API
  block: Add VFIO based NVMe driver
  util: Introduce vfio helpers
  stubs: Add stubs for ram block API
  curl: convert to CoQueue
  coroutine-lock: make qemu_co_enter_next thread-safe
  coroutine-lock: convert CoQueue to use QemuLockable
  lockable: add QemuLockable
  test-coroutine: add simple CoMutex test
  docker: change Fedora base image to fedora:27

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b256b89c 4eb99560

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -1888,6 +1888,12 @@ L: qemu-block@nongnu.org 
S: Supported

F: block/null.c



NVMe Block Driver

M: Fam Zheng <famz@redhat.com>

L: qemu-block@nongnu.org

S: Supported

F: block/nvme*



Bootdevice

M: Gonglei <arei.gonglei@huawei.com>

S: Maintained

block/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ block-obj-$(CONFIG_POSIX) += file-posix.o 
block-obj-$(CONFIG_LINUX_AIO) += linux-aio.o

block-obj-y += null.o mirror.o commit.o io.o

block-obj-y += throttle-groups.o

block-obj-$(CONFIG_LINUX) += nvme.o



block-obj-y += nbd.o nbd-client.o sheepdog.o

block-obj-$(CONFIG_LIBISCSI) += iscsi.o

block/block-backend.c

+10 −0
Original line number Diff line number Diff line
@@ -2096,3 +2096,13 @@ static void blk_root_drained_end(BdrvChild *child) 
        }

    }

}



void blk_register_buf(BlockBackend *blk, void *host, size_t size)

{

    bdrv_register_buf(blk_bs(blk), host, size);

}



void blk_unregister_buf(BlockBackend *blk, void *host)

{

    bdrv_unregister_buf(blk_bs(blk), host);

}

block/curl.c

+4 −16
Original line number Diff line number Diff line
@@ -101,8 +101,6 @@ typedef struct CURLAIOCB { 


    size_t start;

    size_t end;



    QSIMPLEQ_ENTRY(CURLAIOCB) next;

} CURLAIOCB;



typedef struct CURLSocket {
@@ -138,7 +136,7 @@ typedef struct BDRVCURLState { 
    bool accept_range;

    AioContext *aio_context;

    QemuMutex mutex;

    QSIMPLEQ_HEAD(, CURLAIOCB) free_state_waitq;

    CoQueue free_state_waitq;

    char *username;

    char *password;

    char *proxyusername;
@@ -538,7 +536,6 @@ static int curl_init_state(BDRVCURLState *s, CURLState *state) 
/* Called with s->mutex held.  */

static void curl_clean_state(CURLState *s)

{

    CURLAIOCB *next;

    int j;

    for (j = 0; j < CURL_NUM_ACB; j++) {

        assert(!s->acb[j]);
@@ -556,13 +553,7 @@ static void curl_clean_state(CURLState *s) 


    s->in_use = 0;



    next = QSIMPLEQ_FIRST(&s->s->free_state_waitq);

    if (next) {

        QSIMPLEQ_REMOVE_HEAD(&s->s->free_state_waitq, next);

        qemu_mutex_unlock(&s->s->mutex);

        aio_co_wake(next->co);

        qemu_mutex_lock(&s->s->mutex);

    }

    qemu_co_enter_next(&s->s->free_state_waitq, &s->s->mutex);

}



static void curl_parse_filename(const char *filename, QDict *options,
@@ -784,7 +775,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, 
    }



    DPRINTF("CURL: Opening %s\n", file);

    QSIMPLEQ_INIT(&s->free_state_waitq);

    qemu_co_queue_init(&s->free_state_waitq);

    s->aio_context = bdrv_get_aio_context(bs);

    s->url = g_strdup(file);

    qemu_mutex_lock(&s->mutex);
@@ -888,10 +879,7 @@ static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb) 
        if (state) {

            break;

        }

        QSIMPLEQ_INSERT_TAIL(&s->free_state_waitq, acb, next);

        qemu_mutex_unlock(&s->mutex);

        qemu_coroutine_yield();

        qemu_mutex_lock(&s->mutex);

        qemu_co_queue_wait(&s->free_state_waitq, &s->mutex);

    }



    if (curl_init_state(s, state) < 0) {

block/io.c

+24 −0
Original line number Diff line number Diff line
@@ -2825,3 +2825,27 @@ void bdrv_io_unplug(BlockDriverState *bs) 
        bdrv_io_unplug(child->bs);

    }

}



void bdrv_register_buf(BlockDriverState *bs, void *host, size_t size)

{

    BdrvChild *child;



    if (bs->drv && bs->drv->bdrv_register_buf) {

        bs->drv->bdrv_register_buf(bs, host, size);

    }

    QLIST_FOREACH(child, &bs->children, next) {

        bdrv_register_buf(child->bs, host, size);

    }

}



void bdrv_unregister_buf(BlockDriverState *bs, void *host)

{

    BdrvChild *child;



    if (bs->drv && bs->drv->bdrv_unregister_buf) {

        bs->drv->bdrv_unregister_buf(bs, host);

    }

    QLIST_FOREACH(child, &bs->children, next) {

        bdrv_unregister_buf(child->bs, host);

    }

}