From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54268) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aquR7-0004xt-5f for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:28:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aquR6-0003AO-8z for qemu-devel@nongnu.org; Thu, 14 Apr 2016 23:28:49 -0400 From: Fam Zheng Date: Fri, 15 Apr 2016 11:28:01 +0800 Message-Id: <1460690887-32751-12-git-send-email-famz@redhat.com> In-Reply-To: <1460690887-32751-1-git-send-email-famz@redhat.com> References: <1460690887-32751-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7 v2 11/17] qemu-nbd: Add "--no-lock/-L" option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Max Reitz , Jeff Cody , Markus Armbruster , Eric Blake , John Snow , qemu-block@nongnu.org, berrange@redhat.com, pbonzini@redhat.com, den@openvz.org Signed-off-by: Fam Zheng --- 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 -- 2.8.0