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

rpc: Rename construct_pmem_bdev to bdev_pmem_create 



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


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 avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
parent 61a42c0e

doc/bdev.md

+2 −2
Original line number Diff line number Diff line
@@ -527,12 +527,12 @@ Example command 


`rpc.py delete_pmem_pool /path/to/pmem_pool`



To create bdev based on pmemblk pool file user should use `construct_pmem_bdev ` RPC

To create bdev based on pmemblk pool file user should use `bdev_pmem_create ` RPC

command.



Example command



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

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



To remove a block device representation use the delete_pmem_bdev command.

doc/jsonrpc.md

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

~~~



## construct_pmem_bdev {#rpc_construct_pmem_bdev}

## bdev_pmem_create {#rpc_bdev_pmem_create}



Construct @ref bdev_config_pmem bdev.
@@ -2259,7 +2259,7 @@ Example request: 
    "name": "Pmem0"

  },

  "jsonrpc": "2.0",

  "method": "construct_pmem_bdev",

  "method": "bdev_pmem_create",

  "id": 1

}

~~~

module/bdev/pmem/bdev_pmem.c

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ bdev_pmem_write_config_json(struct spdk_bdev *bdev, struct spdk_json_write_ctx * 


	spdk_json_write_object_begin(w);



	spdk_json_write_named_string(w, "method", "construct_pmem_bdev");

	spdk_json_write_named_string(w, "method", "bdev_pmem_create");



	spdk_json_write_named_object_begin(w, "params");

	spdk_json_write_named_string(w, "name", bdev->name);

module/bdev/pmem/bdev_pmem_rpc.c

+6 −5
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct rpc_construct_pmem { 
};



static void

free_rpc_construct_pmem_bdev(struct rpc_construct_pmem *req)

free_rpc_bdev_pmem_create(struct rpc_construct_pmem *req)

{

	free(req->pmem_file);

	free(req->name);
@@ -57,7 +57,7 @@ static const struct spdk_json_object_decoder rpc_construct_pmem_decoders[] = { 
};



static void

spdk_rpc_construct_pmem_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_pmem_create(struct spdk_jsonrpc_request *request,

			  const struct spdk_json_val *params)

{

	struct rpc_construct_pmem req = {};
@@ -84,9 +84,10 @@ spdk_rpc_construct_pmem_bdev(struct spdk_jsonrpc_request *request, 
	spdk_jsonrpc_end_result(request, w);



cleanup:

	free_rpc_construct_pmem_bdev(&req);

	free_rpc_bdev_pmem_create(&req);

}

SPDK_RPC_REGISTER("construct_pmem_bdev", spdk_rpc_construct_pmem_bdev, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("bdev_pmem_create", spdk_rpc_bdev_pmem_create, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_pmem_create, construct_pmem_bdev)



struct rpc_delete_pmem {

	char *name;

scripts/config_converter.py

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ bdev_dict["construct_nvme_bdev"] = [] 
bdev_dict["bdev_nvme_set_hotplug"] = []

bdev_dict["bdev_malloc_create"] = []

bdev_dict["bdev_aio_create"] = []

bdev_dict["construct_pmem_bdev"] = []

bdev_dict["bdev_pmem_create"] = []

bdev_dict["construct_virtio_dev"] = []



vhost_dict = OrderedDict()
@@ -258,7 +258,7 @@ def get_pmem_bdev_json(config, section): 
                        "name": items[1],

                        "pmem_file": items[0]

                    },

                    "method": "construct_pmem_bdev"

                    "method": "bdev_pmem_create"

                })



    return pmem_json