Commit e140177d authored by Max Reitz's avatar Max Reitz Committed by Kevin Wolf
Browse files

nbd: Change external interface to BlockBackend 



Substitute BlockDriverState by BlockBackend in every globally visible
function provided by nbd.

Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-id: 1416309679-333-5-git-send-email-mreitz@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 2c28b21f

blockdev-nbd.c

+8 −7
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include "sysemu/blockdev.h"

#include "sysemu/block-backend.h"

#include "hw/block/block.h"

#include "monitor/monitor.h"

#include "qapi/qmp/qerror.h"
@@ -73,7 +74,7 @@ static void nbd_close_notifier(Notifier *n, void *data) 
void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,

                        Error **errp)

{

    BlockDriverState *bs;

    BlockBackend *blk;

    NBDExport *exp;

    NBDCloseNotifier *n;
@@ -87,12 +88,12 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, 
        return;

    }



    bs = bdrv_find(device);

    if (!bs) {

    blk = blk_by_name(device);

    if (!blk) {

        error_set(errp, QERR_DEVICE_NOT_FOUND, device);

        return;

    }

    if (!bdrv_is_inserted(bs)) {

    if (!blk_is_inserted(blk)) {

        error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);

        return;

    }
@@ -100,18 +101,18 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, 
    if (!has_writable) {

        writable = false;

    }

    if (bdrv_is_read_only(bs)) {

    if (blk_is_read_only(blk)) {

        writable = false;

    }



    exp = nbd_export_new(bs, 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY, NULL);

    exp = nbd_export_new(blk, 0, -1, writable ? 0 : NBD_FLAG_READ_ONLY, NULL);



    nbd_export_set_name(exp, device);



    n = g_new0(NBDCloseNotifier, 1);

    n->n.notify = nbd_close_notifier;

    n->exp = exp;

    bdrv_add_close_notifier(bs, &n->n);

    blk_add_close_notifier(blk, &n->n);

    QTAILQ_INSERT_TAIL(&close_notifiers, n, next);

}

include/block/nbd.h

+3 −4
Original line number Diff line number Diff line
@@ -85,14 +85,13 @@ int nbd_disconnect(int fd); 
typedef struct NBDExport NBDExport;

typedef struct NBDClient NBDClient;



NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,

                          off_t size, uint32_t nbdflags,

                          void (*close)(NBDExport *));

NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,

                          uint32_t nbdflags, void (*close)(NBDExport *));

void nbd_export_close(NBDExport *exp);

void nbd_export_get(NBDExport *exp);

void nbd_export_put(NBDExport *exp);



BlockDriverState *nbd_export_get_blockdev(NBDExport *exp);

BlockBackend *nbd_export_get_blockdev(NBDExport *exp);



NBDExport *nbd_export_find(const char *name);

void nbd_export_set_name(NBDExport *exp, const char *name);

nbd.c

+6 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "block/nbd.h"

#include "block/block.h"

#include "block/block_int.h"

#include "sysemu/block-backend.h"



#include "block/coroutine.h"
@@ -957,10 +958,10 @@ static void bs_aio_detach(void *opaque) 
    exp->ctx = NULL;

}



NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset,

                          off_t size, uint32_t nbdflags,

                          void (*close)(NBDExport *))

NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,

                          uint32_t nbdflags, void (*close)(NBDExport *))

{

    BlockDriverState *bs = blk_bs(blk);

    NBDExport *exp = g_malloc0(sizeof(NBDExport));

    exp->refcount = 1;

    QTAILQ_INIT(&exp->clients);
@@ -1056,9 +1057,9 @@ void nbd_export_put(NBDExport *exp) 
    }

}



BlockDriverState *nbd_export_get_blockdev(NBDExport *exp)

BlockBackend *nbd_export_get_blockdev(NBDExport *exp)

{

    return exp->bs;

    return exp->bs->blk;

}



void nbd_export_close_all(void)

qemu-nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -730,7 +730,7 @@ int main(int argc, char **argv) 
        }

    }



    exp = nbd_export_new(bs, dev_offset, fd_size, nbdflags, nbd_export_closed);

    exp = nbd_export_new(blk, dev_offset, fd_size, nbdflags, nbd_export_closed);



    if (sockpath) {

        fd = unix_socket_incoming(sockpath);