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

block/export: Add node-name to BlockExportOptions

Browse Source 
Every block export needs a block node to export, so add a 'node-name'
option to BlockExportOptions and remove the replaced option 'device'
from BlockExportOptionsNbd.

To maintain compatibility in nbd-server-add, BlockExportOptionsNbd needs
to be wrapped by a new type NbdServerAddOptions that adds 'device' back
because nbd-server-add doesn't use the BlockExportOptions base type at
all (so even without changing it to a 'node-name' option in
block-export-add, this compatibility code would be necessary).

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200924152717.287415-16-kwolf@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2020-09-24 17:27:01 +02:00
parent 8612c68673
commit b6076afcab
4 changed files with 58 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
block/monitor/block-hmp-cmds.c
View File

@ -398,7 +398,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict)
Error *local_err = NULL; Error *local_err = NULL;
BlockInfoList *block_list, *info; BlockInfoList *block_list, *info;
SocketAddress *addr; SocketAddress *addr;
BlockExportOptionsNbd export; NbdServerAddOptions export;
if (writable && !all) { if (writable && !all) {
error_setg(&local_err, "-w only valid together with -a"); error_setg(&local_err, "-w only valid together with -a");
@ -431,7 +431,7 @@ void hmp_nbd_server_start(Monitor *mon, const QDict *qdict)
continue; continue;
} }
export = (BlockExportOptionsNbd) { export = (NbdServerAddOptions) {
.device = info->value->device, .device = info->value->device,
.has_writable = true, .has_writable = true,
.writable = writable, .writable = writable,
@ -458,7 +458,7 @@ void hmp_nbd_server_add(Monitor *mon, const QDict *qdict)
bool writable = qdict_get_try_bool(qdict, "writable", false); bool writable = qdict_get_try_bool(qdict, "writable", false);
Error *local_err = NULL; Error *local_err = NULL;
BlockExportOptionsNbd export = { NbdServerAddOptions export = {
.device = (char *) device, .device = (char *) device,
.has_name = !!name, .has_name = !!name,
.name = (char *) name, .name = (char *) name,

44
blockdev-nbd.c
View File

@ -188,7 +188,7 @@ BlockExport *nbd_export_create(BlockExportOptions *exp_args, Error **errp)
} }
if (!arg->has_name) { if (!arg->has_name) {
arg->name = arg->device; arg->name = exp_args->node_name;
} }
if (strlen(arg->name) > NBD_MAX_STRING_SIZE) { if (strlen(arg->name) > NBD_MAX_STRING_SIZE) {
@ -206,7 +206,7 @@ BlockExport *nbd_export_create(BlockExportOptions *exp_args, Error **errp)
return NULL; return NULL;
} }
bs = bdrv_lookup_bs(arg->device, arg->device, errp); bs = bdrv_lookup_bs(NULL, exp_args->node_name, errp);
if (!bs) { if (!bs) {
return NULL; return NULL;
} }
@ -244,21 +244,40 @@ BlockExport *nbd_export_create(BlockExportOptions *exp_args, Error **errp)
return (BlockExport*) exp; return (BlockExport*) exp;
} }
void qmp_nbd_server_add(BlockExportOptionsNbd *arg, Error **errp) void qmp_nbd_server_add(NbdServerAddOptions *arg, Error **errp)
{ {
BlockExport *export; BlockExport *export;
BlockDriverState *bs; BlockDriverState *bs;
BlockBackend *on_eject_blk; BlockBackend *on_eject_blk;
BlockExportOptions export_opts; BlockExportOptions *export_opts;
bs = bdrv_lookup_bs(arg->device, arg->device, errp); bs = bdrv_lookup_bs(arg->device, arg->device, errp);
if (!bs) { if (!bs) {
return; return;
} }
export_opts = (BlockExportOptions) { /*
.type = BLOCK_EXPORT_TYPE_NBD, * block-export-add would default to the node-name, but we may have to use
.u.nbd = *arg, * the device name as a default here for compatibility.
*/
if (!arg->has_name) {
arg->name = arg->device;
}
export_opts = g_new(BlockExportOptions, 1);
*export_opts = (BlockExportOptions) {
.type = BLOCK_EXPORT_TYPE_NBD,
.node_name = g_strdup(bdrv_get_node_name(bs)),
.u.nbd = {
.has_name = true,
.name = g_strdup(arg->name),
.has_description = arg->has_description,
.description = g_strdup(arg->description),
.has_writable = arg->has_writable,
.writable = arg->writable,
.has_bitmap = arg->has_bitmap,
.bitmap = g_strdup(arg->bitmap),
},
}; };
/* /*
@ -267,13 +286,13 @@ void qmp_nbd_server_add(BlockExportOptionsNbd *arg, Error **errp)
* block-export-add. * block-export-add.
*/ */
if (bdrv_is_read_only(bs)) { if (bdrv_is_read_only(bs)) {
export_opts.u.nbd.has_writable = true; export_opts->u.nbd.has_writable = true;
export_opts.u.nbd.writable = false; export_opts->u.nbd.writable = false;
} }
export = blk_exp_add(&export_opts, errp); export = blk_exp_add(export_opts, errp);
if (!export) { if (!export) {
return; goto fail;
} }
/* /*
@ -284,6 +303,9 @@ void qmp_nbd_server_add(BlockExportOptionsNbd *arg, Error **errp)
if (on_eject_blk) { if (on_eject_blk) {
nbd_export_set_on_eject_blk(export, on_eject_blk); nbd_export_set_on_eject_blk(export, on_eject_blk);
} }
fail:
qapi_free_BlockExportOptions(export_opts);
} }
void qmp_nbd_server_remove(const char *name, void qmp_nbd_server_remove(const char *name,

27
qapi/block-export.json
View File

@ -65,9 +65,8 @@
## ##
# @BlockExportOptionsNbd: # @BlockExportOptionsNbd:
# #
# An NBD block export. # An NBD block export (options shared between nbd-server-add and the NBD branch
# # of block-export-add).
# @device: The device name or node name of the node to be exported
# #
# @name: Export name. If unspecified, the @device parameter is used as the # @name: Export name. If unspecified, the @device parameter is used as the
# export name. (Since 2.12) # export name. (Since 2.12)
@ -85,8 +84,21 @@
# Since: 5.0 # Since: 5.0
## ##
{ 'struct': 'BlockExportOptionsNbd', { 'struct': 'BlockExportOptionsNbd',
'data': {'device': 'str', '*name': 'str', '*description': 'str', 'data': { '*name': 'str', '*description': 'str',
'*writable': 'bool', '*bitmap': 'str' } } '*writable': 'bool', '*bitmap': 'str' } }
##
# @NbdServerAddOptions:
#
# An NBD block export.
#
# @device: The device name or node name of the node to be exported
#
# Since: 5.0
##
{ 'struct': 'NbdServerAddOptions',
'base': 'BlockExportOptionsNbd',
'data': { 'device': 'str' } }
## ##
# @nbd-server-add: # @nbd-server-add:
@ -99,7 +111,7 @@
# Since: 1.3.0 # Since: 1.3.0
## ##
{ 'command': 'nbd-server-add', { 'command': 'nbd-server-add',
'data': 'BlockExportOptionsNbd', 'boxed': true } 'data': 'NbdServerAddOptions', 'boxed': true }
## ##
# @NbdServerRemoveMode: # @NbdServerRemoveMode:
@ -170,6 +182,8 @@
# Describes a block export, i.e. how single node should be exported on an # Describes a block export, i.e. how single node should be exported on an
# external interface. # external interface.
# #
# @node-name: The node name of the block node to be exported (since: 5.2)
#
# @writethrough: If true, caches are flushed after every write request to the # @writethrough: If true, caches are flushed after every write request to the
# export before completion is signalled. (since: 5.2; # export before completion is signalled. (since: 5.2;
# default: false) # default: false)
@ -178,6 +192,7 @@
## ##
{ 'union': 'BlockExportOptions', { 'union': 'BlockExportOptions',
'base': { 'type': 'BlockExportType', 'base': { 'type': 'BlockExportType',
'node-name': 'str',
'*writethrough': 'bool' }, '*writethrough': 'bool' },
'discriminator': 'type', 'discriminator': 'type',
'data': { 'data': {

2
qemu-nbd.c
View File

@ -1064,10 +1064,10 @@ int main(int argc, char **argv)
export_opts = g_new(BlockExportOptions, 1); export_opts = g_new(BlockExportOptions, 1);
*export_opts = (BlockExportOptions) { *export_opts = (BlockExportOptions) {
.type = BLOCK_EXPORT_TYPE_NBD, .type = BLOCK_EXPORT_TYPE_NBD,
.node_name = g_strdup(bdrv_get_node_name(bs)),
.has_writethrough = true, .has_writethrough = true,
.writethrough = writethrough, .writethrough = writethrough,
.u.nbd = { .u.nbd = {
.device = g_strdup(bdrv_get_node_name(bs)),
.has_name = true, .has_name = true,
.name = g_strdup(export_name), .name = g_strdup(export_name),
.has_description = !!export_description, .has_description = !!export_description,