On 08/08/2016 11:18 AM, Stefan Hajnoczi wrote:
> 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 = {
>> },
>> };
>>
>> +static QemuOptsList qemu_iscsi_opts = {
>> + .name = "iscsi",
>> + .head = QTAILQ_HEAD_INITIALIZER(qemu_iscsi_opts.head),
>> + .desc = {
>> + {
>> + .name = "user",
>> + .type = QEMU_OPT_STRING,
>> + .help = "username for CHAP authentication to target",
>> + },{
>> + .name = "password",
>> + .type = QEMU_OPT_STRING,
>> + .help = "password for CHAP authentication to target",
>> + },{
>> + .name = "password-secret",
>> + .type = QEMU_OPT_STRING,
>> + .help = "ID of the secret providing password for CHAP "
>> + "authentication to target",
>> + },{
>> + .name = "header-digest",
>> + .type = QEMU_OPT_STRING,
>> + .help = "HeaderDigest setting. "
>> + "{CRC32C|CRC32C-NONE|NONE-CRC32C|NONE}",
>> + },{
>> + .name = "initiator-name",
>> + .type = QEMU_OPT_STRING,
>> + .help = "Initiator iqn name to use when connecting",
>> + },{
>> + .name = "timeout",
>> + .type = QEMU_OPT_NUMBER,
>> + .help = "Request timeout in seconds (default 0 = no timeout)",
>> + },
>> + { /* 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.
>
Oddly enough I don't actually get any warnings when iscsi is disabled,
but in any case the ifdef should probably be there anyway so I'll fix
and resubmit.
