[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 09/10] qemu-nbd: use no_argument/required_argumen
From: |
Daniel P. Berrange |
Subject: |
[Qemu-devel] [PATCH v4 09/10] qemu-nbd: use no_argument/required_argument constants |
Date: |
Tue, 26 Jan 2016 13:34:21 +0000 |
When declaring the 'struct option' array, use the standard
constants no_argument/required_argument, instead of magic
values 0 and 1.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
---
qemu-nbd.c | 47 ++++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/qemu-nbd.c b/qemu-nbd.c
index bbc79f4..58e1610 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -437,29 +437,30 @@ int main(int argc, char **argv)
const char *sn_id_or_name = NULL;
const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:";
struct option lopt[] = {
- { "help", 0, NULL, 'h' },
- { "version", 0, NULL, 'V' },
- { "bind", 1, NULL, 'b' },
- { "port", 1, NULL, 'p' },
- { "socket", 1, NULL, 'k' },
- { "offset", 1, NULL, 'o' },
- { "read-only", 0, NULL, 'r' },
- { "partition", 1, NULL, 'P' },
- { "connect", 1, NULL, 'c' },
- { "disconnect", 0, NULL, 'd' },
- { "snapshot", 0, NULL, 's' },
- { "load-snapshot", 1, NULL, 'l' },
- { "nocache", 0, NULL, 'n' },
- { "cache", 1, NULL, QEMU_NBD_OPT_CACHE },
- { "aio", 1, NULL, QEMU_NBD_OPT_AIO },
- { "discard", 1, NULL, QEMU_NBD_OPT_DISCARD },
- { "detect-zeroes", 1, NULL, QEMU_NBD_OPT_DETECT_ZEROES },
- { "shared", 1, NULL, 'e' },
- { "format", 1, NULL, 'f' },
- { "persistent", 0, NULL, 't' },
- { "verbose", 0, NULL, 'v' },
- { "object", 1, NULL, QEMU_NBD_OPT_OBJECT },
- { "image-opts", 0, NULL, QEMU_NBD_OPT_IMAGE_OPTS },
+ { "help", no_argument, NULL, 'h' },
+ { "version", no_argument, NULL, 'V' },
+ { "bind", required_argument, NULL, 'b' },
+ { "port", required_argument, NULL, 'p' },
+ { "socket", required_argument, NULL, 'k' },
+ { "offset", required_argument, NULL, 'o' },
+ { "read-only", no_argument, NULL, 'r' },
+ { "partition", required_argument, NULL, 'P' },
+ { "connect", required_argument, NULL, 'c' },
+ { "disconnect", no_argument, NULL, 'd' },
+ { "snapshot", no_argument, NULL, 's' },
+ { "load-snapshot", required_argument, NULL, 'l' },
+ { "nocache", no_argument, NULL, 'n' },
+ { "cache", required_argument, NULL, QEMU_NBD_OPT_CACHE },
+ { "aio", required_argument, NULL, QEMU_NBD_OPT_AIO },
+ { "discard", required_argument, NULL, QEMU_NBD_OPT_DISCARD },
+ { "detect-zeroes", required_argument, NULL,
+ QEMU_NBD_OPT_DETECT_ZEROES },
+ { "shared", required_argument, NULL, 'e' },
+ { "format", required_argument, NULL, 'f' },
+ { "persistent", no_argument, NULL, 't' },
+ { "verbose", no_argument, NULL, 'v' },
+ { "object", required_argument, NULL, QEMU_NBD_OPT_OBJECT },
+ { "image-opts", no_argument, NULL, QEMU_NBD_OPT_IMAGE_OPTS },
{ NULL, 0, NULL, 0 }
};
int ch;
--
2.5.0
- [Qemu-devel] [PATCH v4 03/10] qemu-nbd: add support for --object command line arg, (continued)
- [Qemu-devel] [PATCH v4 03/10] qemu-nbd: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 04/10] qemu-io: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 06/10] qemu-nbd: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 02/10] qemu-img: add support for --object command line arg, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 05/10] qemu-io: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 10/10] qemu-io: use no_argument/required_argument constants, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 08/10] qemu-nbd: don't overlap long option values with short options, Daniel P. Berrange, 2016/01/26
- [Qemu-devel] [PATCH v4 09/10] qemu-nbd: use no_argument/required_argument constants,
Daniel P. Berrange <=
- [Qemu-devel] [PATCH v4 07/10] qemu-img: allow specifying image as a set of options args, Daniel P. Berrange, 2016/01/26