5b15e2ecaf
Notable changes:
* The only big change is the switch to using a custom QIOChannel for
savevm-async, because the previously used QEMUFileOps was dropped.
Changes to the current implementation:
* Switch to vector based methods as required for an IO channel. For
short reads the passed-in IO vector is stuffed with zeroes at the
end, just to be sure.
* For reading: The documentation in include/io/channel.h states that
at least one byte should be read, so also error out when whe are
at the very end instead of returning 0.
* For reading: Fix off-by-one error when request goes beyond end.
The wrong code piece was:
if ((pos + size) > maxlen) {
size = maxlen - pos - 1;
}
Previously, the last byte would not be read. It's actually
possible to get a snapshot .raw file that has content all the way
up the final 512 byte (= BDRV_SECTOR_SIZE) boundary without any
trailing zero bytes (I wrote a script to do it).
Luckily, it didn't cause a real issue, because qemu_loadvm_state()
is not interested in the final (i.e. QEMU_VM_VMDESCRIPTION)
section. The buffer for reading it is simply freed up afterwards
and the function will assume that it read the whole section, even
if that's not the case.
* For writing: Make use of the generated blk_pwritev() wrapper
instead of manually wrapping the coroutine to simplify and save a
few lines.
* Adapt to changed interfaces for blk_{pread,pwrite}:
* a9262f551e ("block: Change blk_{pread,pwrite}() param order")
* 3b35d4542c ("block: Add a 'flags' param to blk_pread()")
* bf5b16fa40 ("block: Make blk_{pread,pwrite}() return 0 on success")
Those changes especially affected the qemu-img dd patches, because
the context also changed, but also some of our block drivers used
the functions.
* Drop qemu-common.h include: it got renamed after essentially
everything was moved to other headers. The only remaining user I
could find for things dropped from the header between 7.0 and 7.1
was qemu_get_vm_name() in the iscsi-initiatorname patch, but it
already includes the header to which the function was moved.
Signed-off-by: Fiona 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 d707d0b354..da6ed52323 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();
|