Implement backend program convention command for vhost-user-blk
PATCH 1/1 Implement backend program convention command for vhost-user-blk
From: michan <[email protected]>
--- contrib/vhost-user-blk/vhost-user-blk.c | 95 +++++++++++++++---------- 1 file changed, 57 insertions(+), 38 deletions(-)
contrib/vhost-user-blk/vhost-user-blk.c +57 -38
@@ -576,70 +576,89 @@ vub_new(char *blk_file)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 opt; -char *unix_socket =NULL ; -char *blk_file =NULL ; -bool enable_ro = false; +{int lsock =-1 , csock =-1 ;VubDev *vdev_blk =NULL ; +GError *error =NULL ; +GOptionContext *context; -while ((opt =getopt (argc, argv,"b:rs:h" )) !=-1 ) { -switch (opt) { -case 'b' : - blk_file =g_strdup (optarg); -break ; -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 ; - } + context =g_option_context_new (NULL ); +g_option_context_add_main_entries (context, entries,NULL ); +if (!g_option_context_parse (context, &argc, &argv, &error)) { +g_printerr ("Option parsing failed: %s\n" , error->message); +exit (EXIT_FAILURE ); + } +if (opt_print_caps) { +g_print ("{\n" ); +g_print (" \"type\": \"blk\",\n" ); +g_print (" \"features\": [\n" ); +g_print (" \"blk-file\",\n" ); +g_print (" \"read-only\"\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" " | -r Enable read-only ] | [ -h ]\n" , argv[0 ]);return -1 ; } - lsock =unix_sock_new (unix_socket); -if (lsock <0 ) { - goto err; +if (opt_socket_path) { + lsock =unix_sock_new (opt_socket_path); +if (lsock <0 ) { +exit (EXIT_FAILURE ); + } + }else { + lsock = opt_fdnum; } - csock =accept (lsock, (void *)0 , (void *)0 ); + csock =accept (lsock,NULL ,NULL );if (csock <0 ) { -fprintf (stderr,"Accept error %s\n" ,strerror (errno)); - goto err; +g_printerr ("Accept error %s\n" ,strerror (errno)); +exit (EXIT_FAILURE ); } - vdev_blk =vub_new (blk_file); + vdev_blk =vub_new (opt_blk_file);if (!vdev_blk) { - goto err; +exit (EXIT_FAILURE ); } -if (enable_ro) { +if (opt_read_only) { vdev_blk->enable_ro = true; }if (!vug_init (&vdev_blk->parent,VHOST_USER_BLK_MAX_QUEUES , csock, vub_panic_cb, &vub_iface)) { -fprintf (stderr,"Failed to initialized libvhost-user-glib\n" ); - goto err; +g_printerr ("Failed to initialized libvhost-user-glib\n" ); +exit (EXIT_FAILURE ); }g_main_loop_run (vdev_blk->loop); +g_main_loop_unref (vdev_blk->loop);vug_deinit (&vdev_blk->parent); - -err:vub_free (vdev_blk);if (csock >=0 ) {close (csock);
@@ -647,8 +666,8 @@ err:if (lsock >=0 ) {close (lsock); } -g_free (unix_socket); -g_free (blk_file); +g_free (opt_socket_path); +g_free (opt_blk_file);return 0 ; }
Signature · 1 line
2.21.0
Patchew URL: https://patchew.org/QEMU/[email protected]/
Patchew URL: https://patchew.org/QEMU/[email protected]/
Hi,
This series seems to have some coding style problems. See output below for more information:
Subject: [PATCH] Implement backend program convention command for vhost-user-blk
Type: series
Message-id: [email protected]
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
2a8f5a3 Implement backend program convention command for vhost-user-blk
=== OUTPUT BEGIN ===
ERROR: trailing whitespace
#44: FILE: contrib/vhost-user-blk/vhost-user-blk.c:600:
+{ $
ERROR: suspect code indent for conditional statements (8, 11) #96: FILE: contrib/vhost-user-blk/vhost-user-blk.c:631:
+ if (lsock < 0) {
+ exit(EXIT_FAILURE);
total: 2 errors, 0 warnings, 135 lines checked
Commit 2a8f5a38e630 (Implement backend program convention command for vhost-user-blk) has style problems, please review. If any of these errors are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]
On Fri, Nov 15, 2019 at 02:09:25PM +0800, Micky Yun Chan wrote:
Thanks for the patch!
Quoted 1 line
+ context =
g_option_context_new(NULL);
Missing g_option_context_free() later in this function. g_auto() is the easiest way to ensure that.
Quoted 10 lines
contrib/vhost-user-blk/vhost-user-blk.c +10
-0+g_option_context_add_main_entries (context, entries,NULL ); +if (!g_option_context_parse (context, &argc, &argv, &error)) { +g_printerr ("Option parsing failed: %s\n" , error->message); +exit (EXIT_FAILURE ); + } +if (opt_print_caps) { +g_print ("{\n" ); +g_print (" \"type\": \"blk\",\n" ); +g_print (" \"features\": [\n" ); +g_print (" \"blk-file\",\n" );
contrib/vhost-user-blk/vhost-user-blk.c vub_new(char *blk_file) · line 625
Quoted 10 lines
contrib/vhost-user-blk/vhost-user-blk.c +5
-1+g_print (" \"read-only\"\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" " | -r Enable read-only ] | [ -h ]\n" , argv[0 ]);
g_option_context_get_help() can be used instead. That way the help text is consistent.
Quoted 1 line
return -1;
A good opportunity to switch to exit(EXIT_FAILURE) since main() should not return -1.
contrib/vhost-user-blk/vhost-user-blk.c vub_new(char *blk_file) · line 634
Quoted 11 lines
}contrib/vhost-user-blk/vhost-user-blk.c +6
-3- lsock =unix_sock_new (unix_socket); -if (lsock <0 ) { - goto err; +if (opt_socket_path) { + lsock =unix_sock_new (opt_socket_path); +if (lsock <0 ) { +exit (EXIT_FAILURE ); + } + }else {
} else if (opt_fd < 0) {
...print usage because neither --socket-path nor --fd were given...
}