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

scripts/rpc: Rename rpc delete_malloc_bdev to bdev_malloc_delete 



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


Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent 8f33ac02

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ Example response: 
    "delete_nvme_controller",

    "construct_nvme_bdev",

    "bdev_null_create",

    "delete_malloc_bdev",

    "bdev_malloc_delete",

    "bdev_malloc_create",

    "delete_ftl_bdev",

    "construct_ftl_bdev",
@@ -1196,7 +1196,7 @@ Example response: 
}

~~~



## delete_malloc_bdev {#rpc_delete_malloc_bdev}

## bdev_malloc_delete {#rpc_bdev_malloc_delete}



Delete @ref bdev_config_malloc
@@ -1216,7 +1216,7 @@ Example request: 
    "name": "Malloc0"

  },

  "jsonrpc": "2.0",

  "method": "delete_malloc_bdev",

  "method": "bdev_malloc_delete",

  "id": 1

}

~~~

doc/vhost.md

+1 −1
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ scripts/rpc.py remove_vhost_scsi_target vhost.0 0 
Removing an entire bdev will hot-detach it from a controller as well.



~~~{.sh}

scripts/rpc.py delete_malloc_bdev Malloc0

scripts/rpc.py bdev_malloc_delete Malloc0

~~~



# Known bugs and limitations {#vhost_bugs}

module/bdev/malloc/bdev_malloc_rpc.c

+5 −4
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static const struct spdk_json_object_decoder rpc_delete_malloc_decoders[] = { 
};



static void

_spdk_rpc_delete_malloc_bdev_cb(void *cb_arg, int bdeverrno)

_spdk_rpc_bdev_malloc_delete_cb(void *cb_arg, int bdeverrno)

{

	struct spdk_jsonrpc_request *request = cb_arg;

	struct spdk_json_write_ctx *w = spdk_jsonrpc_begin_result(request);
@@ -138,7 +138,7 @@ _spdk_rpc_delete_malloc_bdev_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_malloc_delete(struct spdk_jsonrpc_request *request,

			    const struct spdk_json_val *params)

{

	struct rpc_delete_malloc req = {NULL};
@@ -160,7 +160,7 @@ spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	delete_malloc_disk(bdev, _spdk_rpc_delete_malloc_bdev_cb, request);

	delete_malloc_disk(bdev, _spdk_rpc_bdev_malloc_delete_cb, request);



	free_rpc_delete_malloc(&req);
@@ -169,4 +169,5 @@ spdk_rpc_delete_malloc_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free_rpc_delete_malloc(&req);

}

SPDK_RPC_REGISTER("delete_malloc_bdev", spdk_rpc_delete_malloc_bdev, SPDK_RPC_RUNTIME)
 
SPDK_RPC_REGISTER("bdev_malloc_delete", spdk_rpc_bdev_malloc_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_malloc_delete, delete_malloc_bdev)

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -253,13 +253,14 @@ if __name__ == "__main__": 
    p.add_argument('block_size', help='Block size for this bdev', type=int)

    p.set_defaults(func=bdev_malloc_create)



    def delete_malloc_bdev(args):

        rpc.bdev.delete_malloc_bdev(args.client,

    def bdev_malloc_delete(args):

        rpc.bdev.bdev_malloc_delete(args.client,

                                    name=args.name)



    p = subparsers.add_parser('delete_malloc_bdev', help='Delete a malloc disk')

    p = subparsers.add_parser('bdev_malloc_delete', aliases=['delete_malloc_bdev'],

                              help='Delete a malloc disk')

    p.add_argument('name', help='malloc bdev name')

    p.set_defaults(func=delete_malloc_bdev)

    p.set_defaults(func=bdev_malloc_delete)



    def bdev_null_create(args):

        num_blocks = (args.total_size * 1024 * 1024) // args.block_size

scripts/rpc/bdev.py

+3 −2
Original line number Diff line number Diff line
@@ -183,14 +183,15 @@ def bdev_malloc_create(client, num_blocks, block_size, name=None, uuid=None): 
    return client.call('bdev_malloc_create', params)





def delete_malloc_bdev(client, name):

@deprecated_alias('delete_malloc_bdev')

def bdev_malloc_delete(client, name):

    """Delete malloc block device.



    Args:

        bdev_name: name of malloc bdev to delete

    """

    params = {'name': name}

    return client.call('delete_malloc_bdev', params)

    return client.call('bdev_malloc_delete', params)





@deprecated_alias('construct_null_bdev')