jcs.org
qemu with hax to log dma reads & writes
jcs.org/2018/11/12/vfio
iscsi: Drop deprecated -drive parameter "filename"
Parameter "filename" is deprecated since commit 5c3ad1a6a8f, v2.10.0.
Time to get rid of it.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
authored by
Markus Armbruster
and committed by
Kevin Wolf
deadbb8e
bb9f762f
+2
-21
+2
-21
block/iscsi.c
+2
-21
block/iscsi.c
···
1713
1713
.name = "timeout",
1714
1714
.type = QEMU_OPT_NUMBER,
1715
1715
},
1716
-
{
1717
-
.name = "filename",
1718
-
.type = QEMU_OPT_STRING,
1719
-
},
1720
1716
{ /* end of list */ }
1721
1717
},
1722
1718
};
···
1756
1752
char *initiator_name = NULL;
1757
1753
QemuOpts *opts;
1758
1754
Error *local_err = NULL;
1759
-
const char *transport_name, *portal, *target, *filename;
1755
+
const char *transport_name, *portal, *target;
1760
1756
#if LIBISCSI_API_VERSION >= (20160603)
1761
1757
enum iscsi_transport_type transport;
1762
1758
#endif
1763
1759
int i, ret = 0, timeout = 0, lun;
1764
-
1765
-
/* If we are given a filename, parse the filename, with precedence given to
1766
-
* filename encoded options */
1767
-
filename = qdict_get_try_str(options, "filename");
1768
-
if (filename) {
1769
-
warn_report("'filename' option specified. "
1770
-
"This is an unsupported option, and may be deprecated "
1771
-
"in the future");
1772
-
iscsi_parse_filename(filename, options, &local_err);
1773
-
if (local_err) {
1774
-
ret = -EINVAL;
1775
-
error_propagate(errp, local_err);
1776
-
goto exit;
1777
-
}
1778
-
}
1779
1760
1780
1761
opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
1781
1762
qemu_opts_absorb_qdict(opts, options, &local_err);
···
2006
1987
}
2007
1988
memset(iscsilun, 0, sizeof(IscsiLun));
2008
1989
}
2009
-
exit:
1990
+
2010
1991
return ret;
2011
1992
}
2012
1993