diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-12-13 11:10:02 -0800 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-12-13 11:10:02 -0800 |
| commit | bf6e3cc4fadaa6884dd1e561215f5d93cfe4f5f3 (patch) | |
| tree | 5a65f3dcb945804a1d0c4b9b822daca54b61e4da /qemu-options.hx | |
| parent | 47acdd63a33a5966bf4fc94a6ac835d72a70c555 (diff) | |
| parent | 2fe3798cd5fab65ee7c86758b1b7701d7fe3709f (diff) | |
| download | focaccia-qemu-bf6e3cc4fadaa6884dd1e561215f5d93cfe4f5f3.tar.gz focaccia-qemu-bf6e3cc4fadaa6884dd1e561215f5d93cfe4f5f3.zip | |
Merge remote-tracking branch 'bonzini/scsi-next' into staging
# By Paolo Bonzini (4) and Peter Lieven (1)
# Via Paolo Bonzini
* bonzini/scsi-next:
help: add id suboption to -iscsi
scsi-disk: fix WRITE SAME with large non-zero payload
block/iscsi: introduce bdrv_co_{readv, writev, flush_to_disk}
scsi-disk: fix VERIFY emulation
scsi-bus: fix transfer length and direction for VERIFY command
Message-id: 1386594157-17535-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
Diffstat (limited to 'qemu-options.hx')
| -rw-r--r-- | qemu-options.hx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu-options.hx b/qemu-options.hx index af34483021..bcfe9eaa3e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -2096,7 +2096,7 @@ ETEXI DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, "-iscsi [user=user][,password=password]\n" " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" - " [,initiator-name=iqn]\n" + " [,initiator-name=initiator-iqn][,id=target-iqn]\n" " iSCSI session parameters\n", QEMU_ARCH_ALL) STEXI |