OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

nbd: Change external interface to BlockBackend 

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

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1416309679-333-5-git-send-email-mreitz@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Max Reitz 2014-11-18 12:21:17 +01:00 committed by Kevin Wolf
parent 2c28b21f7c
commit e140177d9c
4 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
blockdev-nbd.c
View File

@ -10,6 +10,7 @@
*/ */
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/block-backend.h"
#include "hw/block/block.h" #include "hw/block/block.h"
#include "monitor/monitor.h" #include "monitor/monitor.h"
#include "qapi/qmp/qerror.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, void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
Error **errp) Error **errp)
{ {
BlockDriverState *bs; BlockBackend *blk;
NBDExport *exp; NBDExport *exp;
NBDCloseNotifier *n; NBDCloseNotifier *n;
@ -87,12 +88,12 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
return; return;
} }
bs = bdrv_find(device); blk = blk_by_name(device);
if (!bs) { if (!blk) {
error_set(errp, QERR_DEVICE_NOT_FOUND, device); error_set(errp, QERR_DEVICE_NOT_FOUND, device);
return; return;
} }
if (!bdrv_is_inserted(bs)) { if (!blk_is_inserted(blk)) {
error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device); error_set(errp, QERR_DEVICE_HAS_NO_MEDIUM, device);
return; return;
} }
@ -100,18 +101,18 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable,
if (!has_writable) { if (!has_writable) {
writable = false; writable = false;
} }
if (bdrv_is_read_only(bs)) { if (blk_is_read_only(blk)) {
writable = false; 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); nbd_export_set_name(exp, device);
n = g_new0(NBDCloseNotifier, 1); n = g_new0(NBDCloseNotifier, 1);
n->n.notify = nbd_close_notifier; n->n.notify = nbd_close_notifier;
n->exp = exp; n->exp = exp;
bdrv_add_close_notifier(bs, &n->n); blk_add_close_notifier(blk, &n->n);
QTAILQ_INSERT_TAIL(&close_notifiers, n, next); QTAILQ_INSERT_TAIL(&close_notifiers, n, next);
} }

7
include/block/nbd.h
View File

@ -85,14 +85,13 @@ int nbd_disconnect(int fd);
typedef struct NBDExport NBDExport; typedef struct NBDExport NBDExport;
typedef struct NBDClient NBDClient; typedef struct NBDClient NBDClient;
NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,
off_t size, uint32_t nbdflags, uint32_t nbdflags, void (*close)(NBDExport *));
void (*close)(NBDExport *));
void nbd_export_close(NBDExport *exp); void nbd_export_close(NBDExport *exp);
void nbd_export_get(NBDExport *exp); void nbd_export_get(NBDExport *exp);
void nbd_export_put(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); NBDExport *nbd_export_find(const char *name);
void nbd_export_set_name(NBDExport *exp, const char *name); void nbd_export_set_name(NBDExport *exp, const char *name);

11
nbd.c
View File

@ -19,6 +19,7 @@
#include "block/nbd.h" #include "block/nbd.h"
#include "block/block.h" #include "block/block.h"
#include "block/block_int.h" #include "block/block_int.h"
#include "sysemu/block-backend.h"
#include "block/coroutine.h" #include "block/coroutine.h"
@ -957,10 +958,10 @@ static void bs_aio_detach(void *opaque)
exp->ctx = NULL; exp->ctx = NULL;
} }
NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size,
off_t size, uint32_t nbdflags, uint32_t nbdflags, void (*close)(NBDExport *))
void (*close)(NBDExport *))
{ {
BlockDriverState *bs = blk_bs(blk);
NBDExport *exp = g_malloc0(sizeof(NBDExport)); NBDExport *exp = g_malloc0(sizeof(NBDExport));
exp->refcount = 1; exp->refcount = 1;
QTAILQ_INIT(&exp->clients); 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) void nbd_export_close_all(void)

2
qemu-nbd.c
View File

@ -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) { if (sockpath) {
fd = unix_socket_incoming(sockpath); fd = unix_socket_incoming(sockpath);