Commit edb18971 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Jim Harris
Browse files

rpc: Rename remove_vhost_controller to vhost_delete_controller 



Change-Id: I819cecbd8456f3f978cc3560f31e285bb2cbbe5d
Signed-off-by: default avatarPawel Kaminski <pawelx.kaminski@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/469863


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
parent eda1ec69

doc/jsonrpc.md

+2 −2
Original line number Diff line number Diff line
@@ -4772,7 +4772,7 @@ Example response: 
}

~~~



## remove_vhost_controller {#rpc_remove_vhost_controller}

## vhost_delete_controller {#rpc_vhost_delete_controller}



Remove vhost target.
@@ -4795,7 +4795,7 @@ Example request: 
    "ctrlr": "VhostNvme0"

  },

  "jsonrpc": "2.0",

  "method": "remove_vhost_controller",

  "method": "vhost_delete_controller",

  "id": 1

}

~~~

doc/vhost.md

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ Users can use the following command to remove the controller, all the block 
devices attached to controller's Namespace will be removed automatically.



~~~{.sh}

$rpc_py remove_vhost_controller vhost.2

$rpc_py vhost_delete_controller vhost.2

~~~



## QEMU {#vhost_qemu_config}

lib/vhost/vhost_rpc.c

+12 −11
Original line number Diff line number Diff line
@@ -291,31 +291,31 @@ invalid: 
SPDK_RPC_REGISTER("construct_vhost_blk_controller", spdk_rpc_construct_vhost_blk_controller,

		  SPDK_RPC_RUNTIME)



struct rpc_remove_vhost_ctrlr {

struct rpc_delete_vhost_ctrlr {

	char *ctrlr;

};



static const struct spdk_json_object_decoder rpc_remove_vhost_ctrlr[] = {

	{"ctrlr", offsetof(struct rpc_remove_vhost_ctrlr, ctrlr), spdk_json_decode_string },

static const struct spdk_json_object_decoder rpc_delete_vhost_ctrlr_decoder[] = {

	{"ctrlr", offsetof(struct rpc_delete_vhost_ctrlr, ctrlr), spdk_json_decode_string },

};



static void

free_rpc_remove_vhost_ctrlr(struct rpc_remove_vhost_ctrlr *req)

free_rpc_delete_vhost_ctrlr(struct rpc_delete_vhost_ctrlr *req)

{

	free(req->ctrlr);

}



static void

spdk_rpc_remove_vhost_controller(struct spdk_jsonrpc_request *request,

spdk_rpc_vhost_delete_controller(struct spdk_jsonrpc_request *request,

				 const struct spdk_json_val *params)

{

	struct rpc_remove_vhost_ctrlr req = {0};

	struct rpc_delete_vhost_ctrlr req = {0};

	struct spdk_json_write_ctx *w;

	struct spdk_vhost_dev *vdev;

	int rc;



	if (spdk_json_decode_object(params, rpc_remove_vhost_ctrlr,

				    SPDK_COUNTOF(rpc_remove_vhost_ctrlr), &req)) {

	if (spdk_json_decode_object(params, rpc_delete_vhost_ctrlr_decoder,

				    SPDK_COUNTOF(rpc_delete_vhost_ctrlr_decoder), &req)) {

		SPDK_DEBUGLOG(SPDK_LOG_VHOST_RPC, "spdk_json_decode_object failed\n");

		rc = -EINVAL;

		goto invalid;
@@ -335,7 +335,7 @@ spdk_rpc_remove_vhost_controller(struct spdk_jsonrpc_request *request, 
		goto invalid;

	}



	free_rpc_remove_vhost_ctrlr(&req);

	free_rpc_delete_vhost_ctrlr(&req);



	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_bool(w, true);
@@ -344,12 +344,13 @@ spdk_rpc_remove_vhost_controller(struct spdk_jsonrpc_request *request, 
	return;



invalid:

	free_rpc_remove_vhost_ctrlr(&req);

	free_rpc_delete_vhost_ctrlr(&req);

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

					 spdk_strerror(-rc));



}

SPDK_RPC_REGISTER("remove_vhost_controller", spdk_rpc_remove_vhost_controller, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("vhost_delete_controller", spdk_rpc_vhost_delete_controller, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_delete_controller, remove_vhost_controller)



struct rpc_get_vhost_ctrlrs {

	char *name;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -1937,13 +1937,14 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p.add_argument('-n', '--name', help="Name of vhost controller", required=False)

    p.set_defaults(func=get_vhost_controllers)



    def remove_vhost_controller(args):

        rpc.vhost.remove_vhost_controller(args.client,

    def vhost_delete_controller(args):

        rpc.vhost.vhost_delete_controller(args.client,

                                          ctrlr=args.ctrlr)



    p = subparsers.add_parser('remove_vhost_controller', help='Remove a vhost controller')

    p = subparsers.add_parser('vhost_delete_controller', aliases=['remove_vhost_controller'],

                              help='Delete a vhost controller')

    p.add_argument('ctrlr', help='controller name')

    p.set_defaults(func=remove_vhost_controller)

    p.set_defaults(func=vhost_delete_controller)



    def bdev_virtio_attach_controller(args):

        print_array(rpc.vhost.bdev_virtio_attach_controller(args.client,

scripts/rpc/vhost.py

+4 −3
Original line number Diff line number Diff line
@@ -124,13 +124,14 @@ def get_vhost_controllers(client, name=None): 
    return client.call('get_vhost_controllers', params)





def remove_vhost_controller(client, ctrlr):

    """Remove vhost controller from configuration.

@deprecated_alias('remove_vhost_controller')

def vhost_delete_controller(client, ctrlr):

    """Delete vhost controller from configuration.

    Args:

        ctrlr: controller name to remove

    """

    params = {'ctrlr': ctrlr}

    return client.call('remove_vhost_controller', params)

    return client.call('vhost_delete_controller', params)





@deprecated_alias('construct_virtio_dev')