Implement backend program convention command for vhost-user-blk

This patch is to add standard commands defined in docs/interop/vhost-user.rst
For vhost-user-* program

Signed-off-by: Micky Yun Chan (michiboo) <chanmickyyun@gmail.com>
Message-Id: <20191209015331.5455-1-chanmickyyun@gmail.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Micky Yun Chan 2019-12-09 09:53:31 +08:00 committed by Michael S. Tsirkin
parent 9d7bd0826f
commit 6620801f39
3 changed files with 112 additions and 44 deletions

View File

@ -576,70 +576,90 @@ vub_new(char *blk_file)
return vdev_blk; return vdev_blk;
} }
static int opt_fdnum = -1;
static char *opt_socket_path;
static char *opt_blk_file;
static gboolean opt_print_caps;
static gboolean opt_read_only;
static GOptionEntry entries[] = {
{ "print-capabilities", 'c', 0, G_OPTION_ARG_NONE, &opt_print_caps,
"Print capabilities", NULL },
{ "fd", 'f', 0, G_OPTION_ARG_INT, &opt_fdnum,
"Use inherited fd socket", "FDNUM" },
{ "socket-path", 's', 0, G_OPTION_ARG_FILENAME, &opt_socket_path,
"Use UNIX socket path", "PATH" },
{"blk-file", 'b', 0, G_OPTION_ARG_FILENAME, &opt_blk_file,
"block device or file path", "PATH"},
{ "read-only", 'r', 0, G_OPTION_ARG_NONE, &opt_read_only,
"Enable read-only", NULL }
};
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
int opt;
char *unix_socket = NULL;
char *blk_file = NULL;
bool enable_ro = false;
int lsock = -1, csock = -1; int lsock = -1, csock = -1;
VubDev *vdev_blk = NULL; VubDev *vdev_blk = NULL;
GError *error = NULL;
GOptionContext *context;
while ((opt = getopt(argc, argv, "b:rs:h")) != -1) { context = g_option_context_new(NULL);
switch (opt) { g_option_context_add_main_entries(context, entries, NULL);
case 'b': if (!g_option_context_parse(context, &argc, &argv, &error)) {
blk_file = g_strdup(optarg); g_printerr("Option parsing failed: %s\n", error->message);
break; exit(EXIT_FAILURE);
case 's':
unix_socket = g_strdup(optarg);
break;
case 'r':
enable_ro = true;
break;
case 'h':
default:
printf("Usage: %s [ -b block device or file, -s UNIX domain socket"
" | -r Enable read-only ] | [ -h ]\n", argv[0]);
return 0;
} }
if (opt_print_caps) {
g_print("{\n");
g_print(" \"type\": \"block\",\n");
g_print(" \"features\": [\n");
g_print(" \"read-only\",\n");
g_print(" \"blk-file\"\n");
g_print(" ]\n");
g_print("}\n");
exit(EXIT_SUCCESS);
} }
if (!unix_socket || !blk_file) { if (!opt_blk_file) {
printf("Usage: %s [ -b block device or file, -s UNIX domain socket" g_print("%s\n", g_option_context_get_help(context, true, NULL));
" | -r Enable read-only ] | [ -h ]\n", argv[0]); exit(EXIT_FAILURE);
return -1;
} }
lsock = unix_sock_new(unix_socket); if (opt_socket_path) {
lsock = unix_sock_new(opt_socket_path);
if (lsock < 0) { if (lsock < 0) {
goto err; exit(EXIT_FAILURE);
}
} else if (opt_fdnum < 0) {
g_print("%s\n", g_option_context_get_help(context, true, NULL));
exit(EXIT_FAILURE);
} else {
lsock = opt_fdnum;
} }
csock = accept(lsock, (void *)0, (void *)0); csock = accept(lsock, NULL, NULL);
if (csock < 0) { if (csock < 0) {
fprintf(stderr, "Accept error %s\n", strerror(errno)); g_printerr("Accept error %s\n", strerror(errno));
goto err; exit(EXIT_FAILURE);
} }
vdev_blk = vub_new(blk_file); vdev_blk = vub_new(opt_blk_file);
if (!vdev_blk) { if (!vdev_blk) {
goto err; exit(EXIT_FAILURE);
} }
if (enable_ro) { if (opt_read_only) {
vdev_blk->enable_ro = true; vdev_blk->enable_ro = true;
} }
if (!vug_init(&vdev_blk->parent, VHOST_USER_BLK_MAX_QUEUES, csock, if (!vug_init(&vdev_blk->parent, VHOST_USER_BLK_MAX_QUEUES, csock,
vub_panic_cb, &vub_iface)) { vub_panic_cb, &vub_iface)) {
fprintf(stderr, "Failed to initialized libvhost-user-glib\n"); g_printerr("Failed to initialize libvhost-user-glib\n");
goto err; exit(EXIT_FAILURE);
} }
g_main_loop_run(vdev_blk->loop); g_main_loop_run(vdev_blk->loop);
g_main_loop_unref(vdev_blk->loop);
g_option_context_free(context);
vug_deinit(&vdev_blk->parent); vug_deinit(&vdev_blk->parent);
err:
vub_free(vdev_blk); vub_free(vdev_blk);
if (csock >= 0) { if (csock >= 0) {
close(csock); close(csock);
@ -647,8 +667,8 @@ err:
if (lsock >= 0) { if (lsock >= 0) {
close(lsock); close(lsock);
} }
g_free(unix_socket); g_free(opt_socket_path);
g_free(blk_file); g_free(opt_blk_file);
return 0; return 0;
} }

View File

@ -54,6 +54,37 @@
] ]
} }
##
# @VHostUserBackendBlockFeature:
#
# List of vhost user "block" features.
#
# @read-only: The --read-only command line option is supported.
# @blk-file: The --blk-file command line option is supported.
#
# Since: 5.0
##
{
'enum': 'VHostUserBackendBlockFeature',
'data': [ 'read-only', 'blk-file' ]
}
##
# @VHostUserBackendCapabilitiesBlock:
#
# Capabilities reported by vhost user "block" backends
#
# @features: list of supported features.
#
# Since: 5.0
##
{
'struct': 'VHostUserBackendCapabilitiesBlock',
'data': {
'features': [ 'VHostUserBackendBlockFeature' ]
}
}
## ##
# @VHostUserBackendInputFeature: # @VHostUserBackendInputFeature:
# #

View File

@ -1376,3 +1376,20 @@ Command line options:
Enable virgl rendering support. Enable virgl rendering support.
(optional) (optional)
vhost-user-blk
--------------
Command line options:
--blk-file=PATH
Specify block device or file path.
(optional)
--read-only
Enable read-only.
(optional)