From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45591) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bWmJm-0002yl-3d for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:18:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bWmJh-0007uQ-Tq for qemu-devel@nongnu.org; Mon, 08 Aug 2016 11:18:17 -0400 Date: Mon, 8 Aug 2016 16:18:09 +0100 From: Stefan Hajnoczi Message-ID: <20160808151809.GE25553@stefanha-x1.localdomain> References: <1470147137-21970-1-git-send-email-clord@redhat.com> <1470147137-21970-2-git-send-email-clord@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="phCU5ROyZO6kBE05" Content-Disposition: inline In-Reply-To: <1470147137-21970-2-git-send-email-clord@redhat.com> Subject: Re: [Qemu-devel] [Qemu-block] [PATCH v6 1/4] blockdev: prepare iSCSI block driver for dynamic loading List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Colin Lord Cc: qemu-devel@nongnu.org, kwolf@redhat.com, qemu-block@nongnu.org, mreitz@redhat.com --phCU5ROyZO6kBE05 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Aug 02, 2016 at 10:12:14AM -0400, Colin Lord wrote: > diff --git a/vl.c b/vl.c > index e7c2c62..1a5f807 100644 > --- a/vl.c > +++ b/vl.c > @@ -506,6 +506,41 @@ static QemuOptsList qemu_fw_cfg_opts =3D { > }, > }; > =20 > +static QemuOptsList qemu_iscsi_opts =3D { > + .name =3D "iscsi", > + .head =3D QTAILQ_HEAD_INITIALIZER(qemu_iscsi_opts.head), > + .desc =3D { > + { > + .name =3D "user", > + .type =3D QEMU_OPT_STRING, > + .help =3D "username for CHAP authentication to target", > + },{ > + .name =3D "password", > + .type =3D QEMU_OPT_STRING, > + .help =3D "password for CHAP authentication to target", > + },{ > + .name =3D "password-secret", > + .type =3D QEMU_OPT_STRING, > + .help =3D "ID of the secret providing password for CHAP " > + "authentication to target", > + },{ > + .name =3D "header-digest", > + .type =3D QEMU_OPT_STRING, > + .help =3D "HeaderDigest setting. " > + "{CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}", > + },{ > + .name =3D "initiator-name", > + .type =3D QEMU_OPT_STRING, > + .help =3D "Initiator iqn name to use when connecting", > + },{ > + .name =3D "timeout", > + .type =3D QEMU_OPT_NUMBER, > + .help =3D "Request timeout in seconds (default 0 =3D no time= out)", > + }, > + { /* end of list */ } > + }, > +}; > + > /** > * Get machine options > * > @@ -3001,6 +3036,9 @@ int main(int argc, char **argv, char **envp) > qemu_add_opts(&qemu_icount_opts); > qemu_add_opts(&qemu_semihosting_config_opts); > qemu_add_opts(&qemu_fw_cfg_opts); > +#ifdef CONFIG_LIBISCSI > + qemu_add_opts(&qemu_iscsi_opts); > +#endif This will probably produce "unused variable" warnings and cause the build to fail when CONFIG_LIBISCSI is not defined. In this case I'd add an ifdef around qemu_iscsi_opts. --phCU5ROyZO6kBE05 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAEBAgAGBQJXqKKxAAoJEJykq7OBq3PIkmAIAKl+0EmH1ciwTECtXSBsxBGk ArL4+3TasHIm6/bW8i4C+biQPdwDsv261nNH29JdAsRxDC0eYtbildvszPbux3rp 3blYWGgEjQSedhAgLwyWir+WbutXJJ6h3WFBc5YqQFx1KMjci3WJvrDV5KjuNblU aDl8OT6XethWSAGfc4p4Of/GJsVpSlBLWHIUQlej5yNu6XwYDg4UpjUFlaSEuoTk Y3acwulInSBLj1LgRnsXKqAUi0XaYfBH5K9YFMpaXv1Lo9GzxN2saL1+wal8qib2 zRmIJ7NFJMeGetxcV3wkFLOQJ5i2/TwhKd1jp27G0YQDUeSrkpnv/Mzfjzx0WhE= =gpsx -----END PGP SIGNATURE----- --phCU5ROyZO6kBE05--