Commit c1b87b3d authored by Maciej Wawryk's avatar Maciej Wawryk Committed by Jim Harris
Browse files

RPC: rename remove_virtio_bdev to bdev_virtio_detach_controller 



Signed-off-by: default avatarMaciej Wawryk <maciejx.wawryk@intel.com>
Change-Id: Ie29a8067c2282a368ecf61e15cadbc2494c2ba0e
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468120


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 7df830a8

doc/bdev.md

+2 −2
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ reflect all parameters passed to QEMU's vhost-user-scsi-pci device. 


Virtio-Block devices can be removed with the following command



`rpc.py remove_virtio_bdev VirtioBlk0`

`rpc.py bdev_virtio_detach_controller VirtioBlk0`



# Virtio SCSI {#bdev_config_virtio_scsi}
@@ -574,6 +574,6 @@ one LUN (LUN0) per SCSI device. The above 2 commands will output names of all ex 


Virtio-SCSI devices can be removed with the following command



`rpc.py remove_virtio_bdev VirtioScsi0`

`rpc.py bdev_virtio_detach_controller VirtioScsi0`



Removing a Virtio-SCSI device will destroy all its bdevs.

doc/jsonrpc.md

+3 −3
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ Example response: 
    "scan_ioat_copy_engine",

    "construct_virtio_dev",

    "get_virtio_scsi_devs",

    "remove_virtio_bdev",

    "bdev_virtio_detach_controller",

    "bdev_aio_delete",

    "bdev_aio_create",

    "bdev_split_delete",
@@ -2492,7 +2492,7 @@ Example response: 
}

~~~



## remove_virtio_bdev {#rpc_remove_virtio_bdev}

## bdev_virtio_detach_controller {#rpc_bdev_virtio_detach_controller}



Remove a Virtio device. This command can be used to remove any type of virtio device.
@@ -2512,7 +2512,7 @@ Example request: 
    "name": "VirtioUser0"

  },

  "jsonrpc": "2.0",

  "method": "remove_virtio_bdev",

  "method": "bdev_virtio_detach_controller",

  "id": 1

}

module/bdev/virtio/bdev_virtio_rpc.c

+8 −6
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static const struct spdk_json_object_decoder rpc_remove_virtio_dev[] = { 
};



static void

spdk_rpc_remove_virtio_bdev_cb(void *ctx, int errnum)

spdk_rpc_bdev_virtio_detach_controller_cb(void *ctx, int errnum)

{

	struct spdk_jsonrpc_request *request = ctx;

	struct spdk_json_write_ctx *w;
@@ -69,7 +69,7 @@ spdk_rpc_remove_virtio_bdev_cb(void *ctx, int errnum) 
}



static void

spdk_rpc_remove_virtio_bdev(struct spdk_jsonrpc_request *request,

spdk_rpc_bdev_virtio_detach_controller(struct spdk_jsonrpc_request *request,

				       const struct spdk_json_val *params)

{

	struct rpc_remove_virtio_dev req = {NULL};
@@ -83,9 +83,9 @@ spdk_rpc_remove_virtio_bdev(struct spdk_jsonrpc_request *request, 
		goto cleanup;

	}



	rc = bdev_virtio_blk_dev_remove(req.name, spdk_rpc_remove_virtio_bdev_cb, request);

	rc = bdev_virtio_blk_dev_remove(req.name, spdk_rpc_bdev_virtio_detach_controller_cb, request);

	if (rc == -ENODEV) {

		rc = bdev_virtio_scsi_dev_remove(req.name, spdk_rpc_remove_virtio_bdev_cb, request);

		rc = bdev_virtio_scsi_dev_remove(req.name, spdk_rpc_bdev_virtio_detach_controller_cb, request);

	}



	if (rc != 0) {
@@ -95,7 +95,9 @@ spdk_rpc_remove_virtio_bdev(struct spdk_jsonrpc_request *request, 
cleanup:

	free(req.name);

}

SPDK_RPC_REGISTER("remove_virtio_bdev", spdk_rpc_remove_virtio_bdev, SPDK_RPC_RUNTIME);

SPDK_RPC_REGISTER("bdev_virtio_detach_controller",

		  spdk_rpc_bdev_virtio_detach_controller, SPDK_RPC_RUNTIME)

SPDK_RPC_REGISTER_ALIAS_DEPRECATED(bdev_virtio_detach_controller, remove_virtio_bdev)



static void

spdk_rpc_get_virtio_scsi_devs(struct spdk_jsonrpc_request *request,

scripts/rpc.py

+6 −5
Original line number Diff line number Diff line
@@ -1905,14 +1905,15 @@ Format: 'user:u1 secret:s1 muser:mu1 msecret:ms1,user:u2 secret:s2 muser:mu2 mse 
    p = subparsers.add_parser('get_virtio_scsi_devs', help='List all Virtio-SCSI devices.')

    p.set_defaults(func=get_virtio_scsi_devs)



    def remove_virtio_bdev(args):

        rpc.vhost.remove_virtio_bdev(args.client,

    def bdev_virtio_detach_controller(args):

        rpc.vhost.bdev_virtio_detach_controller(args.client,

                                                name=args.name)



    p = subparsers.add_parser('remove_virtio_bdev', help="""Remove a Virtio device

    p = subparsers.add_parser('bdev_virtio_detach_controller', aliases=['remove_virtio_bdev'],

                              help="""Remove a Virtio device

    This will delete all bdevs exposed by this device""")

    p.add_argument('name', help='Virtio device name. E.g. VirtioUser0')

    p.set_defaults(func=remove_virtio_bdev)

    p.set_defaults(func=bdev_virtio_detach_controller)



    # ioat

    def scan_ioat_copy_engine(args):

scripts/rpc/vhost.py

+6 −2
Original line number Diff line number Diff line 
from .helpers import deprecated_alias





def set_vhost_controller_coalescing(client, ctrlr, delay_base_us, iops_threshold):

    """Set coalescing for vhost controller.

    Args:
@@ -155,14 +158,15 @@ def construct_virtio_dev(client, name, trtype, traddr, dev_type, vq_count=None, 
    return client.call('construct_virtio_dev', params)





def remove_virtio_bdev(client, name):

@deprecated_alias('remove_virtio_bdev ')

def bdev_virtio_detach_controller(client, name):

    """Remove a Virtio device

    This will delete all bdevs exposed by this device.

    Args:

        name: virtio device name

    """

    params = {'name': name}

    return client.call('remove_virtio_bdev', params)

    return client.call('bdev_virtio_detach_controller', params)





def get_virtio_scsi_devs(client):