Commit 568ce213 authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Ben Walker
Browse files

rpc: Rename delete_pmem_bdev to bdev_pmem_delete 



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


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBroadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
parent f2086995

doc/bdev.md

+2 −2
Original line number Diff line number Diff line
@@ -534,9 +534,9 @@ Example command 


`rpc.py bdev_pmem_create /path/to/pmem_pool -n pmem`



To remove a block device representation use the delete_pmem_bdev command.

To remove a block device representation use the bdev_pmem_delete command.



`rpc.py delete_pmem_bdev pmem`

`rpc.py bdev_pmem_delete pmem`



# Virtio Block {#bdev_config_virtio_blk}

doc/jsonrpc.md

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

~~~



## delete_pmem_bdev {#rpc_delete_pmem_bdev}

## bdev_pmem_delete {#rpc_bdev_pmem_delete}



Delete @ref bdev_config_pmem bdev. This call will not remove backing pool files.
@@ -2300,7 +2300,7 @@ Example request: 
    "name": "Pmem0"

  },

  "jsonrpc": "2.0",

  "method": "delete_pmem_bdev",

  "method": "bdev_pmem_delete",

  "id": 1

}

~~~

module/bdev/pmem/bdev_pmem_rpc.c

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



static void

_spdk_rpc_delete_pmem_bdev_cb(void *cb_arg, int bdeverrno)

_spdk_rpc_bdev_pmem_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);
@@ -114,7 +114,7 @@ _spdk_rpc_delete_pmem_bdev_cb(void *cb_arg, int bdeverrno) 
}



static void

spdk_rpc_delete_pmem_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_pmem_delete(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_delete_pmem req = {NULL};
@@ -135,12 +135,13 @@ spdk_rpc_delete_pmem_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	spdk_delete_pmem_disk(bdev, _spdk_rpc_delete_pmem_bdev_cb, request);

	spdk_delete_pmem_disk(bdev, _spdk_rpc_bdev_pmem_delete_cb, request);



cleanup:

	free_rpc_delete_pmem(&req);

}

SPDK_RPC_REGISTER("delete_pmem_bdev", spdk_rpc_delete_pmem_bdev, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_pmem_delete", spdk_rpc_bdev_pmem_delete, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_delete, delete_pmem_bdev)



struct rpc_create_pmem_pool {

	char *pmem_file;

scripts/rpc.py

+5 −4
Original line number Diff line number Diff line
@@ -540,13 +540,14 @@ if __name__ == "__main__": 
    p.add_argument('-n', '--name', help='Block device name', required=True)

    p.set_defaults(func=bdev_pmem_create)



    def delete_pmem_bdev(args):

        rpc.bdev.delete_pmem_bdev(args.client,

    def bdev_pmem_delete(args):

        rpc.bdev.bdev_pmem_delete(args.client,

                                  name=args.name)



    p = subparsers.add_parser('delete_pmem_bdev', help='Delete a pmem bdev')

    p = subparsers.add_parser('bdev_pmem_delete', aliases=['delete_pmem_bdev'],

                              help='Delete a pmem bdev')

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

    p.set_defaults(func=delete_pmem_bdev)

    p.set_defaults(func=bdev_pmem_delete)



    def construct_passthru_bdev(args):

        print_json(rpc.bdev.construct_passthru_bdev(args.client,

scripts/rpc/bdev.py

+3 −2
Original line number Diff line number Diff line
@@ -596,14 +596,15 @@ def bdev_pmem_create(client, pmem_file, name): 
    return client.call('bdev_pmem_create', params)





def delete_pmem_bdev(client, name):

@deprecated_alias('delete_pmem_bdev')

def bdev_pmem_delete(client, name):

    """Remove pmem bdev from the system.



    Args:

        name: name of pmem bdev to delete

    """

    params = {'name': name}

    return client.call('delete_pmem_bdev', params)

    return client.call('bdev_pmem_delete', params)





def construct_passthru_bdev(client, base_bdev_name, name):