[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCHv2 3/3] qemu-nbd: fix indentation and coding styl
From: |
Benoît Canet |
Subject: |
Re: [Qemu-devel] [PATCHv2 3/3] qemu-nbd: fix indentation and coding style |
Date: |
Thu, 14 Aug 2014 15:30:17 +0200 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
The Wednesday 13 Aug 2014 à 19:20:19 (+0200), Peter Lieven wrote :
> Signed-off-by: Peter Lieven <address@hidden>
> ---
> qemu-nbd.c | 75
> +++++++++++++++++++++++++++++++-----------------------------
> 1 file changed, 39 insertions(+), 36 deletions(-)
>
> diff --git a/qemu-nbd.c b/qemu-nbd.c
> index 6ef8b10..9bc152e 100644
> --- a/qemu-nbd.c
> +++ b/qemu-nbd.c
> @@ -39,10 +39,10 @@
> #include <libgen.h>
> #include <pthread.h>
>
> -#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
> -#define QEMU_NBD_OPT_CACHE 1
> -#define QEMU_NBD_OPT_AIO 2
> -#define QEMU_NBD_OPT_DISCARD 3
> +#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
> +#define QEMU_NBD_OPT_CACHE 1
> +#define QEMU_NBD_OPT_AIO 2
> +#define QEMU_NBD_OPT_DISCARD 3
> #define QEMU_NBD_OPT_DETECT_ZEROES 4
We could also make these an enum.
Reviewed-by: Benoit Canet <address@hidden>
>
> static NBDExport *exp;
> @@ -60,44 +60,44 @@ static void usage(const char *name)
> "Usage: %s [OPTIONS] FILE\n"
> "QEMU Disk Network Block Device Server\n"
> "\n"
> -" -h, --help display this help and exit\n"
> -" -V, --version output version information and exit\n"
> +" -h, --help display this help and exit\n"
> +" -V, --version output version information and exit\n"
> "\n"
> "Connection properties:\n"
> -" -p, --port=PORT port to listen on (default `%d')\n"
> -" -b, --bind=IFACE interface to bind to (default `0.0.0.0')\n"
> -" -k, --socket=PATH path to the unix socket\n"
> -" (default '"SOCKET_PATH"')\n"
> -" -e, --shared=NUM device can be shared by NUM clients (default '1')\n"
> -" -t, --persistent don't exit on the last connection\n"
> -" -v, --verbose display extra debugging information\n"
> +" -p, --port=PORT port to listen on (default `%d')\n"
> +" -b, --bind=IFACE interface to bind to (default `0.0.0.0')\n"
> +" -k, --socket=PATH path to the unix socket\n"
> +" (default '"SOCKET_PATH"')\n"
> +" -e, --shared=NUM device can be shared by NUM clients (default
> '1')\n"
> +" -t, --persistent don't exit on the last connection\n"
> +" -v, --verbose display extra debugging information\n"
> "\n"
> "Exposing part of the image:\n"
> -" -o, --offset=OFFSET offset into the image\n"
> -" -P, --partition=NUM only expose partition NUM\n"
> +" -o, --offset=OFFSET offset into the image\n"
> +" -P, --partition=NUM only expose partition NUM\n"
> "\n"
> #ifdef __linux__
> "Kernel NBD client support:\n"
> -" -c, --connect=DEV connect FILE to the local NBD device DEV\n"
> -" -d, --disconnect disconnect the specified device\n"
> +" -c, --connect=DEV connect FILE to the local NBD device DEV\n"
> +" -d, --disconnect disconnect the specified device\n"
> "\n"
> #endif
> "\n"
> "Block device options:\n"
> -" -f, --format=FORMAT set image format (raw, qcow2, ...)\n"
> -" -r, --read-only export read-only\n"
> -" -s, --snapshot use FILE as an external snapshot, create a
> temporary\n"
> -" file with backing_file=FILE, redirect the write to\n"
> -" the temporary one\n"
> +" -f, --format=FORMAT set image format (raw, qcow2, ...)\n"
> +" -r, --read-only export read-only\n"
> +" -s, --snapshot use FILE as an external snapshot, create a
> temporary\n"
> +" file with backing_file=FILE, redirect the write
> to\n"
> +" the temporary one\n"
> " -l, --load-snapshot=SNAPSHOT_PARAM\n"
> -" load an internal snapshot inside FILE and export
> it\n"
> -" as an read-only device, SNAPSHOT_PARAM format is\n"
> -" 'snapshot.id=[ID],snapshot.name=[NAME]', or\n"
> -" '[ID_OR_NAME]'\n"
> -" -n, --nocache disable host cache\n"
> -" --cache=MODE set cache mode (none, writeback, ...)\n"
> +" load an internal snapshot inside FILE and
> export it\n"
> +" as an read-only device, SNAPSHOT_PARAM format
> is\n"
> +" 'snapshot.id=[ID],snapshot.name=[NAME]', or\n"
> +" '[ID_OR_NAME]'\n"
> +" -n, --nocache disable host cache\n"
> +" --cache=MODE set cache mode (none, writeback, ...)\n"
> #ifdef CONFIG_LINUX_AIO
> -" --aio=MODE set AIO mode (native or threads)\n"
> +" --aio=MODE set AIO mode (native or threads)\n"
> #endif
> " --discard=MODE set discard mode (ignore, unmap)\n"
> " --detect-zeroes=MODE set detect-zeroes mode (off, on, discard)\n"
> @@ -546,15 +546,18 @@ int main(int argc, char **argv)
> break;
> case 'P':
> partition = strtol(optarg, &end, 0);
> - if (*end)
> + if (*end) {
> errx(EXIT_FAILURE, "Invalid partition `%s'", optarg);
> - if (partition < 1 || partition > 8)
> + }
> + if (partition < 1 || partition > 8) {
> errx(EXIT_FAILURE, "Invalid partition %d", partition);
> + }
> break;
> case 'k':
> sockpath = optarg;
> - if (sockpath[0] != '/')
> + if (sockpath[0] != '/') {
> errx(EXIT_FAILURE, "socket path must be absolute\n");
> + }
> break;
> case 'd':
> disconnect = true;
> @@ -574,9 +577,9 @@ int main(int argc, char **argv)
> case 'f':
> fmt = optarg;
> break;
> - case 't':
> - persistent = 1;
> - break;
> + case 't':
> + persistent = 1;
> + break;
> case 'v':
> verbose = 1;
> break;
> @@ -611,7 +614,7 @@ int main(int argc, char **argv)
>
> printf("%s disconnected\n", argv[optind]);
>
> - return 0;
> + return 0;
> }
>
> if (device && !verbose) {
> --
> 1.7.9.5
>
>