Commit 30a10e68 authored by Daniel Verkamp's avatar Daniel Verkamp Committed by Jim Harris
Browse files

bdev: add delete_bdev RPC 



Change-Id: Iac0298d5f10c937107a70287af4586a5c37e73bf
Signed-off-by: default avatarDaniel Verkamp <daniel.verkamp@intel.com>
parent 731edf84

lib/bdev/rpc/bdev_rpc.c

+61 −0
Original line number Diff line number Diff line
@@ -90,3 +90,64 @@ spdk_rpc_get_bdevs(struct spdk_jsonrpc_server_conn *conn, 
	spdk_jsonrpc_end_result(conn, w);

}

SPDK_RPC_REGISTER("get_bdevs", spdk_rpc_get_bdevs)





struct rpc_delete_bdev {

	char *name;

};



static void

free_rpc_delete_bdev(struct rpc_delete_bdev *r)

{

	free(r->name);

}



static const struct spdk_json_object_decoder rpc_delete_bdev_decoders[] = {

	{"name", offsetof(struct rpc_delete_bdev, name), spdk_json_decode_string},

};



static void

spdk_rpc_delete_bdev(struct spdk_jsonrpc_server_conn *conn,

		     const struct spdk_json_val *params,

		     const struct spdk_json_val *id)

{

	struct rpc_delete_bdev req = {};

	struct spdk_bdev *bdev;

	struct spdk_json_write_ctx *w;



	if (spdk_json_decode_object(params, rpc_delete_bdev_decoders,

				    sizeof(rpc_delete_bdev_decoders) / sizeof(*rpc_delete_bdev_decoders),

				    &req)) {

		SPDK_ERRLOG("spdk_json_decode_object failed\n");

		goto invalid;

	}



	if (req.name == NULL) {

		SPDK_ERRLOG("missing name param\n");

		goto invalid;

	}



	bdev = spdk_bdev_get_by_name(req.name);

	if (bdev == NULL) {

		SPDK_ERRLOG("bdev '%s' does not exist\n", req.name);

		goto invalid;

	}



	spdk_bdev_unregister(bdev);



	free_rpc_delete_bdev(&req);



	if (id == NULL) {

		return;

	}



	w = spdk_jsonrpc_begin_result(conn, id);

	spdk_json_write_bool(w, true);

	spdk_jsonrpc_end_result(conn, w);

	return;



invalid:

	spdk_jsonrpc_send_error_response(conn, id, SPDK_JSONRPC_ERROR_INVALID_PARAMS, "Invalid parameters");

	free_rpc_delete_bdev(&req);

}

SPDK_RPC_REGISTER("delete_bdev", spdk_rpc_delete_bdev)

scripts/rpc.py

+10 −0
Original line number Diff line number Diff line
@@ -338,6 +338,16 @@ def get_bdevs(args): 
p = subparsers.add_parser('get_bdevs', help='Display current blockdev list')

p.set_defaults(func=get_bdevs)





def delete_bdev(args):

    params = {'name': args.bdev_name}

    jsonrpc_call('delete_bdev', params)



p = subparsers.add_parser('delete_bdev', help='Delete a blockdev')

p.add_argument('bdev_name', help='Blockdev name to be deleted. Example: Malloc0.')

p.set_defaults(func=delete_bdev)





def get_nvmf_subsystems(args):

    print_dict(jsonrpc_call('get_nvmf_subsystems'))