From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu] fix #3728: handle machine without type
Date: Wed, 17 Nov 2021 10:41:17 +0100 [thread overview]
Message-ID: <20211117094117.1872784-1-f.gruenbichler@proxmox.com> (raw)
libguestfs starts their helper VMs with `-machine accel=..` without a
machine type, and our pve version suffix handling would segfault in that
case. there might be other scripted use cases that are affected as well.
this regression was introduced with the rebase of our patch set on top
of 6.1.0
Fixes: f376b2b9e2fc1f0c8f9c6275e96ede5f423c4126
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
...E-Allow-version-code-in-machine-type.patch | 22 ++++++++++---------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch b/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch
index c54a5f8..0eb9682 100644
--- a/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch
+++ b/debian/patches/pve/0024-PVE-Allow-version-code-in-machine-type.patch
@@ -93,7 +93,7 @@ index d87cf6e103..e5010236f3 100644
g_slist_free(machines);
if (local_err) {
error_append_hint(&local_err, "Use -machine help to list supported machines\n");
-@@ -3312,12 +3318,29 @@ void qemu_init(int argc, char **argv, char **envp)
+@@ -3312,12 +3318,31 @@ void qemu_init(int argc, char **argv, char **envp)
case QEMU_OPTION_machine:
{
bool help;
@@ -109,15 +109,17 @@ index d87cf6e103..e5010236f3 100644
+
+ // PVE version is specified with '+' as seperator, e.g. pc-i440fx+pvever
+ name = qdict_get_try_str(machine_opts_dict, "type");
-+ name_len = strlen(name);
-+ pvever_index = strcspn(name, "+");
-+ if (pvever_index < name_len) {
-+ name_clean = g_strndup(name, pvever_index);
-+ pvever = g_strndup(name + pvever_index + 1, name_len - pvever_index - 1);
-+ qdict_put_str(machine_opts_dict, "pvever", pvever);
-+ qdict_put_str(machine_opts_dict, "type", name_clean);
-+ g_free(name_clean);
-+ g_free(pvever);
++ if (name != NULL) {
++ name_len = strlen(name);
++ pvever_index = strcspn(name, "+");
++ if (pvever_index < name_len) {
++ name_clean = g_strndup(name, pvever_index);
++ pvever = g_strndup(name + pvever_index + 1, name_len - pvever_index - 1);
++ qdict_put_str(machine_opts_dict, "pvever", pvever);
++ qdict_put_str(machine_opts_dict, "type", name_clean);
++ g_free(name_clean);
++ g_free(pvever);
++ }
+ }
+
break;
--
2.30.2
next reply other threads:[~2021-11-17 9:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-17 9:41 Fabian Grünbichler [this message]
2021-11-17 10:38 ` Dominik Csapak
2021-11-17 16:20 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211117094117.1872784-1-f.gruenbichler@proxmox.com \
--to=f.gruenbichler@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.