Commit 5f6f7edd authored by Pawel Kaminski's avatar Pawel Kaminski Committed by Tomasz Zawadzki
Browse files

rpc: Rename add_vhost_nvme_ns to vhost_nvme_controller_add_ns 



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


Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent ca731a6a

doc/jsonrpc.md

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

~~~



## add_vhost_nvme_ns {#rpc_add_vhost_nvme_ns}

## vhost_nvme_controller_add_ns {#rpc_vhost_nvme_controller_add_ns}



Add namespace backed by `bdev_name`
@@ -4565,7 +4565,7 @@ Example request: 
    "ctrlr": "VhostNvme0"

  },

  "jsonrpc": "2.0",

  "method": "add_vhost_nvme_ns",

  "method": "vhost_nvme_controller_add_ns",

  "id": 1

}

~~~

doc/vhost.md

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ controller, at least 1 Namespace is required for each controller. 


~~~{.sh}

$rpc_py vhost_create_nvme_controller --cpumask 0x1 vhost.2 16

$rpc_py add_vhost_nvme_ns vhost.2 Malloc0

$rpc_py vhost_nvme_controller_add_ns vhost.2 Malloc0

~~~



Users can use the following command to remove the controller, all the block

lib/vhost/vhost_nvme.c

+1 −1
Original line number Diff line number Diff line
@@ -1269,7 +1269,7 @@ spdk_vhost_nvme_write_config_json(struct spdk_vhost_dev *vdev, struct spdk_json_ 
		}



		spdk_json_write_object_begin(w);

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

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



		spdk_json_write_named_object_begin(w, "params");

		spdk_json_write_named_string(w, "ctrlr", nvme->vdev.name);

lib/vhost/vhost_rpc.c

+12 −10
Original line number Diff line number Diff line
@@ -578,28 +578,28 @@ SPDK_RPC_REGISTER("vhost_create_nvme_controller", spdk_rpc_vhost_create_nvme_con 
		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_create_nvme_controller, construct_vhost_nvme_controller)



struct rpc_add_vhost_nvme_ctrlr_ns {

struct rpc_vhost_nvme_ctrlr_add_ns {

	char *ctrlr;

	char *bdev_name;

};



static void

free_rpc_add_vhost_nvme_ctrlr_ns(struct rpc_add_vhost_nvme_ctrlr_ns *req)

free_rpc_vhost_nvme_ctrlr_add_ns(struct rpc_vhost_nvme_ctrlr_add_ns *req)

{

	free(req->ctrlr);

	free(req->bdev_name);

}



static const struct spdk_json_object_decoder rpc_vhost_nvme_add_ns[] = {

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

	{"bdev_name", offsetof(struct rpc_add_vhost_nvme_ctrlr_ns, bdev_name), spdk_json_decode_string },

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

	{"bdev_name", offsetof(struct rpc_vhost_nvme_ctrlr_add_ns, bdev_name), spdk_json_decode_string },

};



static void

spdk_rpc_add_vhost_nvme_ns(struct spdk_jsonrpc_request *request,

spdk_rpc_vhost_nvme_controller_add_ns(struct spdk_jsonrpc_request *request,

				      const struct spdk_json_val *params)

{

	struct rpc_add_vhost_nvme_ctrlr_ns req = {0};

	struct rpc_vhost_nvme_ctrlr_add_ns req = {0};

	struct spdk_json_write_ctx *w;

	struct spdk_vhost_dev *vdev;

	int rc;
@@ -625,7 +625,7 @@ spdk_rpc_add_vhost_nvme_ns(struct spdk_jsonrpc_request *request, 
	if (rc < 0) {

		goto invalid;

	}

	free_rpc_add_vhost_nvme_ctrlr_ns(&req);

	free_rpc_vhost_nvme_ctrlr_add_ns(&req);



	w = spdk_jsonrpc_begin_result(request);

	spdk_json_write_bool(w, true);
@@ -633,11 +633,13 @@ spdk_rpc_add_vhost_nvme_ns(struct spdk_jsonrpc_request *request, 
	return;



invalid:

	free_rpc_add_vhost_nvme_ctrlr_ns(&req);

	free_rpc_vhost_nvme_ctrlradd__ns(&req);

	spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INVALID_PARAMS,

					 spdk_strerror(-rc));

}

SPDK_RPC_REGISTER("add_vhost_nvme_ns", spdk_rpc_add_vhost_nvme_ns, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER("vhost_nvme_controller_add_ns", spdk_rpc_vhost_nvme_controller_add_ns,

		  SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(vhost_nvme_controller_add_ns, add_vhost_nvme_ns)



#endif /* SPDK_CONFIG_VHOST_INTERNAL_LIB */

scripts/config_converter.py

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ def get_vhost_nvme_json(config, section): 
                "ctrlr": params[0][3],

                "bdev_name": namespace,

            },

            "method": "add_vhost_nvme_ns"

            "method": "vhost_nvme_controller_add_ns"

        })



    return vhost_nvme_json