diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2024-02-13 13:56:29 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2024-02-13 13:56:29 +0000 |
| commit | 3971462c3581c91c4e8668856be9bc383b6682ad (patch) | |
| tree | 26a4ca8562d9d2f8bd33497745444553d24ccc6e /qemu-nbd.c | |
| parent | 61e7a0d27c1336bade78c08e898801e8e93e0bde (diff) | |
| parent | f6e33708bbb824d493863bc936d3c86fc86f2004 (diff) | |
| download | focaccia-qemu-3971462c3581c91c4e8668856be9bc383b6682ad.tar.gz focaccia-qemu-3971462c3581c91c4e8668856be9bc383b6682ad.zip | |
Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging
trivial patches for 2024-02-13 # -----BEGIN PGP SIGNATURE----- # # iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmXLIcgPHG1qdEB0bHMu # bXNrLnJ1AAoJEHAbT2saaT5Z2lMIAKBuoLX48bbaFsU3dHzPKtB3kVbBpsWJgkGd # EovqkDTEDiX3+bvPkosUUkuZzRF3STTZx5jSQ5iKHYtwQ6ZnHOLALe/L6JCOHIs2 # DMeet0gacwB5sBDfXJAPDDETDLwaYv3MlQrxb2ok9ouDR4EJXFs8K7444BilhNHt # nLE+Xtfm7oQBMgzivHSN6/6Y4DTU6mFLt6o+772EVfu6wrI07kOGZ1s/VCeLhqyZ # 6gppVAx5nbBAryndi6lVvqfo+1mReAIKpreslWgsBb5H1IpXKimG1wd7mrqHFpva # OLmBuNySe0plvjIkGKM72rPR15MPn7UmHNmnyq6qFzVjLetV2i0= # =f4L7 # -----END PGP SIGNATURE----- # gpg: Signature made Tue 13 Feb 2024 08:01:12 GMT # gpg: using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59 # gpg: issuer "mjt@tls.msk.ru" # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full] # gpg: aka "Michael Tokarev <mjt@corpit.ru>" [full] # gpg: aka "Michael Tokarev <mjt@debian.org>" [full] # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: monitor/target: Include missing 'exec/memory.h' header cpu-target: Include missing 'exec/memory.h' header system: Move memory_ldst.c.inc to system qemu-options.hx: Add zoom-to-fit to option summary for gtk qemu-options.hx: document that tftp=dir is readonly iothread: Simplify expression in qemu_in_iothread() qemu-nbd: mention --tls-hostname option in qemu-nbd --help MAINTAINERS: Cover qapi/stats.json MAINTAINERS: Cover qapi/cxl.json hw/smbios: Fix port connector option validation hw/smbios: Fix OEM strings table option validation hw/arm/smmuv3: Consolidate the use of device_class_set_parent_realize() hw/intc/s390_flic: Consolidate the use of device_class_set_parent_realize() hw/isa/pc87312: Consolidate the use of device_class_set_parent_realize() hw/isa/vt82c686: Consolidate the use of device_class_set_parent_realize() Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-nbd.c')
| -rw-r--r-- | qemu-nbd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index bac0b5e3ec..d7b3ccab21 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -114,6 +114,7 @@ static void usage(const char *name) " --tls-creds=ID use id of an earlier --object to provide TLS\n" " --tls-authz=ID use id of an earlier --object to provide\n" " authorization\n" +" --tls-hostname=HOSTNAME override hostname used to check x509 certificate\n" " -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n" " specify tracing options\n" " --fork fork off the server process and exit the parent\n" |