| Message ID | 20171002140307.5292-5-armbru@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemu-options: Texinfo and --help fixes | expand |
On 10/02/2017 09:03 AM, Markus Armbruster wrote: > -iscsi ended up under the "Device URL Syntax" heading by a sequence of > errors, as explained in the previous commit. Move it under the "Block > device options" heading. Nothing left under "Device URL Syntax"; > drop the heading. > > Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Max Reitz <mreitz@redhat.com> > Cc: qemu-block@nongnu.org > Signed-off-by: Markus Armbruster <armbru@redhat.com> > --- > qemu-options.hx | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > Reviewed-by: Eric Blake <eblake@redhat.com>
On Mon, Oct 2, 2017 at 4:03 PM, Markus Armbruster <armbru@redhat.com> wrote: > -iscsi ended up under the "Device URL Syntax" heading by a sequence of > errors, as explained in the previous commit. Move it under the "Block > device options" heading. Nothing left under "Device URL Syntax"; > drop the heading. > > Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> > Cc: Kevin Wolf <kwolf@redhat.com> > Cc: Max Reitz <mreitz@redhat.com> > Cc: qemu-block@nongnu.org > Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > qemu-options.hx | 15 +++++++-------- > 1 file changed, 7 insertions(+), 8 deletions(-) > > diff --git a/qemu-options.hx b/qemu-options.hx > index f112281d37..c647fdde62 100644 > --- a/qemu-options.hx > +++ b/qemu-options.hx > @@ -1172,6 +1172,13 @@ STEXI > Create synthetic file system image > 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=initiator-iqn][,id=target-iqn]\n" > + " [,timeout=timeout]\n" > + " iSCSI session parameters\n", QEMU_ARCH_ALL) > + > STEXI > @end table > ETEXI > @@ -2811,14 +2818,6 @@ STEXI > ETEXI > DEFHEADING() > > -DEFHEADING(Device URL Syntax:) > -DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, > - "-iscsi [user=user][,password=password]\n" > - " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" > - " [,initiator-name=initiator-iqn][,id=target-iqn]\n" > - " [,timeout=timeout]\n" > - " iSCSI session parameters\n", QEMU_ARCH_ALL) > - > DEFHEADING(Bluetooth(R) options:) > STEXI > @table @option > -- > 2.13.6 > >
Reviewed-by: Ronnie Sahlberg <ronniesahlberg@gmail.com> Would be nice if this died at some stage : [,password=password] But that is for a different patch. On Wed, Oct 4, 2017 at 8:12 PM, Marc-André Lureau <marcandre.lureau@gmail.com> wrote: > On Mon, Oct 2, 2017 at 4:03 PM, Markus Armbruster <armbru@redhat.com> wrote: >> -iscsi ended up under the "Device URL Syntax" heading by a sequence of >> errors, as explained in the previous commit. Move it under the "Block >> device options" heading. Nothing left under "Device URL Syntax"; >> drop the heading. >> >> Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> >> Cc: Kevin Wolf <kwolf@redhat.com> >> Cc: Max Reitz <mreitz@redhat.com> >> Cc: qemu-block@nongnu.org >> Signed-off-by: Markus Armbruster <armbru@redhat.com> > > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > >> --- >> qemu-options.hx | 15 +++++++-------- >> 1 file changed, 7 insertions(+), 8 deletions(-) >> >> diff --git a/qemu-options.hx b/qemu-options.hx >> index f112281d37..c647fdde62 100644 >> --- a/qemu-options.hx >> +++ b/qemu-options.hx >> @@ -1172,6 +1172,13 @@ STEXI >> Create synthetic file system image >> 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=initiator-iqn][,id=target-iqn]\n" >> + " [,timeout=timeout]\n" >> + " iSCSI session parameters\n", QEMU_ARCH_ALL) >> + >> STEXI >> @end table >> ETEXI >> @@ -2811,14 +2818,6 @@ STEXI >> ETEXI >> DEFHEADING() >> >> -DEFHEADING(Device URL Syntax:) >> -DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, >> - "-iscsi [user=user][,password=password]\n" >> - " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" >> - " [,initiator-name=initiator-iqn][,id=target-iqn]\n" >> - " [,timeout=timeout]\n" >> - " iSCSI session parameters\n", QEMU_ARCH_ALL) >> - >> DEFHEADING(Bluetooth(R) options:) >> STEXI >> @table @option >> -- >> 2.13.6 >> >> > > > > -- > Marc-André Lureau
diff --git a/qemu-options.hx b/qemu-options.hx index f112281d37..c647fdde62 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1172,6 +1172,13 @@ STEXI Create synthetic file system image 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=initiator-iqn][,id=target-iqn]\n" + " [,timeout=timeout]\n" + " iSCSI session parameters\n", QEMU_ARCH_ALL) + STEXI @end table ETEXI @@ -2811,14 +2818,6 @@ STEXI ETEXI DEFHEADING() -DEFHEADING(Device URL Syntax:) -DEF("iscsi", HAS_ARG, QEMU_OPTION_iscsi, - "-iscsi [user=user][,password=password]\n" - " [,header-digest=CRC32C|CR32C-NONE|NONE-CRC32C|NONE\n" - " [,initiator-name=initiator-iqn][,id=target-iqn]\n" - " [,timeout=timeout]\n" - " iSCSI session parameters\n", QEMU_ARCH_ALL) - DEFHEADING(Bluetooth(R) options:) STEXI @table @option
-iscsi ended up under the "Device URL Syntax" heading by a sequence of errors, as explained in the previous commit. Move it under the "Block device options" heading. Nothing left under "Device URL Syntax"; drop the heading. Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com> Cc: Kevin Wolf <kwolf@redhat.com> Cc: Max Reitz <mreitz@redhat.com> Cc: qemu-block@nongnu.org Signed-off-by: Markus Armbruster <armbru@redhat.com> --- qemu-options.hx | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)