On 04/15/2016 06:28 AM, Fam Zheng wrote:
Signed-off-by: Fam Zheng <f...@redhat.com>
---
  qemu-nbd.c    | 6 +++++-
  qemu-nbd.texi | 2 ++
  2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/qemu-nbd.c b/qemu-nbd.c
index b5751f8..37da7a9 100644
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -464,7 +464,7 @@ int main(int argc, char **argv)
      off_t fd_size;
      QemuOpts *sn_opts = NULL;
      const char *sn_id_or_name = NULL;
-    const char *sopt = "hVb:o:p:rsnP:c:dvk:e:f:tl:x:";
+    const char *sopt = "hVb:o:p:rsnLP:c:dvk:e:f:tl:x:";
      struct option lopt[] = {
          { "help", no_argument, NULL, 'h' },
          { "version", no_argument, NULL, 'V' },
@@ -473,6 +473,7 @@ int main(int argc, char **argv)
          { "socket", required_argument, NULL, 'k' },
          { "offset", required_argument, NULL, 'o' },
          { "read-only", no_argument, NULL, 'r' },
+        { "no-lock", no_argument, NULL, 'L' },
          { "partition", required_argument, NULL, 'P' },
          { "connect", required_argument, NULL, 'c' },
          { "disconnect", no_argument, NULL, 'd' },
@@ -628,6 +629,9 @@ int main(int argc, char **argv)
              nbdflags |= NBD_FLAG_READ_ONLY;
              flags &= ~BDRV_O_RDWR;
              break;
+        case 'L':
+            flags |= BDRV_O_NO_LOCK;
+            break;
          case 'P':
              partition = strtol(optarg, &end, 0);
              if (*end) {
diff --git a/qemu-nbd.texi b/qemu-nbd.texi
index 9f23343..6b7b1d1 100644
--- a/qemu-nbd.texi
+++ b/qemu-nbd.texi
@@ -43,6 +43,8 @@ Force the use of the block driver for format @var{fmt} 
instead of
  auto-detecting
  @item -r, --read-only
  Export the disk as read-only
+@item -L, --no-lock
+Disable image locking
  @item -P, --partition=@var{num}
  Only expose partition @var{num}
  @item -s, --snapshot
pls fix

static void usage(const char *name)
{
    (printf) (
"Usage: %s [OPTIONS] FILE\n"


Reply via email to