4567474e95
Notable changes:
* bdrv_co_p{discard,readv,writev,write_zeroes} function signatures
changed, to using int64_t for offsets/bytes and some still had int
rather than BrdvRequestFlags for the flags.
* job_cancel_sync now has a force parameter. Commit messages in
73895f3838cd7fdaf185cf1dbc47be58844a966f
4cfb3f05627ad82af473e7f7ae113c3884cd04e3
sound like using force=true makes more sense.
* Added 3 patches coming in via qemu-stable tag, most important one is
to work around a librbd issue.
* Added another 3 patches from qemu-devel to fix issue leading to
crash when live migrating with iothread.
* cluster_size calculation helper changed (see patch pve/0026).
* QAPI's if conditionals now use 'CONFIG_FOO' rather than
'defined(CONFIG_FOO)'
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
70 lines
2.2 KiB
Diff
70 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Fabian Ebner <f.ebner@proxmox.com>
|
|
Date: Tue, 17 Nov 2020 10:51:05 +0100
|
|
Subject: [PATCH] PVE: fall back to open-iscsi initiatorname
|
|
|
|
When no explicit option is given, try reading the initiator name from
|
|
/etc/iscsi/initiatorname.iscsi and only use the generic fallback, i.e.
|
|
iqn.2008-11.org.linux-kvmXXX, as a third alternative.
|
|
|
|
This avoids the need to add an explicit option for vma and to explicitly set it
|
|
for each call to qemu that deals with iSCSI disks, while still allowing to set
|
|
the option if a different name is needed.
|
|
|
|
According to RFC 3720, an initiator name is at most 223 bytes long, so the
|
|
4 KiB buffer is big enough, even if many whitespaces are used.
|
|
|
|
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
block/iscsi.c | 30 ++++++++++++++++++++++++++++++
|
|
1 file changed, 30 insertions(+)
|
|
|
|
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
index 57aa07a40d..a8902b84d5 100644
|
|
--- a/block/iscsi.c
|
|
+++ b/block/iscsi.c
|
|
@@ -1386,12 +1386,42 @@ static char *get_initiator_name(QemuOpts *opts)
|
|
const char *name;
|
|
char *iscsi_name;
|
|
UuidInfo *uuid_info;
|
|
+ FILE *name_fh;
|
|
|
|
name = qemu_opt_get(opts, "initiator-name");
|
|
if (name) {
|
|
return g_strdup(name);
|
|
}
|
|
|
|
+ name_fh = fopen("/etc/iscsi/initiatorname.iscsi", "r");
|
|
+ if (name_fh) {
|
|
+ const char *key = "InitiatorName";
|
|
+ char buffer[4096];
|
|
+ char *line;
|
|
+
|
|
+ while ((line = fgets(buffer, sizeof(buffer), name_fh))) {
|
|
+ line = g_strstrip(line);
|
|
+ if (!strncmp(line, key, strlen(key))) {
|
|
+ line = strchr(line, '=');
|
|
+ if (!line || strlen(line) == 1) {
|
|
+ continue;
|
|
+ }
|
|
+ line++;
|
|
+ g_strstrip(line);
|
|
+ if (!strlen(line)) {
|
|
+ continue;
|
|
+ }
|
|
+ name = line;
|
|
+ break;
|
|
+ }
|
|
+ }
|
|
+ fclose(name_fh);
|
|
+
|
|
+ if (name) {
|
|
+ return g_strdup(name);
|
|
+ }
|
|
+ }
|
|
+
|
|
uuid_info = qmp_query_uuid(NULL);
|
|
if (strcmp(uuid_info->UUID, UUID_NONE) == 0) {
|
|
name = qemu_get_vm_name();
|