|
|
7711c0 |
From 38e564acf5939c83ded3e324091a1e00631a12f8 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Fri, 22 Mar 2019 03:22:23 +0100
|
|
|
7711c0 |
Subject: [PATCH 056/163] qemu-nbd: Document --tls-creds
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190322032241.8111-11-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 85103
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 10/28] qemu-nbd: Document --tls-creds
|
|
|
7711c0 |
Bugzilla: 1691563
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
From: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
Commit 145614a1 introduced --tls-creds and documented it in
|
|
|
7711c0 |
qemu-nbd.texi, but forgot to document it in 'qemu-nbd --help'.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Message-Id: <20181003180426.602765-1-eblake@redhat.com>
|
|
|
7711c0 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit f7812df77d7830c6b375066a4e656f3b79232c13)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
qemu-nbd.c | 1 +
|
|
|
7711c0 |
1 file changed, 1 insertion(+)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/qemu-nbd.c b/qemu-nbd.c
|
|
|
7711c0 |
index 51b9d38..66e023f 100644
|
|
|
7711c0 |
--- a/qemu-nbd.c
|
|
|
7711c0 |
+++ b/qemu-nbd.c
|
|
|
7711c0 |
@@ -94,6 +94,7 @@ static void usage(const char *name)
|
|
|
7711c0 |
"General purpose options:\n"
|
|
|
7711c0 |
" --object type,id=ID,... define an object such as 'secret' for providing\n"
|
|
|
7711c0 |
" passwords and/or encryption keys\n"
|
|
|
7711c0 |
+" --tls-creds=ID use id of an earlier --object to provide TLS\n"
|
|
|
7711c0 |
" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
|
|
|
7711c0 |
" specify tracing options\n"
|
|
|
7711c0 |
" --fork fork off the server process and exit the parent\n"
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|