all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 2/6] machine: get current: make it clear that pve-version only exists for the current machine
Date: Fri, 10 Nov 2023 14:24:47 +0100	[thread overview]
Message-ID: <20231110132451.67482-4-f.ebner@proxmox.com> (raw)
In-Reply-To: <20231110132451.67482-1-f.ebner@proxmox.com>

by adding a comment and grouping the code better. See the PVE QEMU
patch "PVE: Allow version code in machine type" for reference. The way
the code was written previously made it look like a bug where
$pve_version might be overwritten multiple times.

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 PVE/QemuServer/Machine.pm | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm
index a4bc24a5..85cfb89c 100644
--- a/PVE/QemuServer/Machine.pm
+++ b/PVE/QemuServer/Machine.pm
@@ -21,14 +21,16 @@ sub machine_type_is_q35 {
 sub current_from_query_machines {
     my ($machines) = @_;
 
-    my ($current, $pve_version, $default);
+    my ($current, $default);
     for my $machine ($machines->@*) {
 	$default = $machine->{name} if $machine->{'is-default'};
-	$current = $machine->{name} if $machine->{'is-current'};
-	$pve_version = $machine->{'pve-version'} if $machine->{'pve-version'};
-    }
 
-    $current .= "+$pve_version" if $current && $pve_version;
+	if ($machine->{'is-current'}) {
+	    $current = $machine->{name};
+	    # pve-version only exists for the current machine
+	    $current .= "+$machine->{'pve-version'}" if $machine->{'pve-version'};
+	}
+    }
 
     # fallback to the default machine if current is not supported by qemu
     return $current || $default || 'pc';
-- 
2.39.2





  parent reply	other threads:[~2023-11-10 13:25 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-10 13:24 [pve-devel] [PATCH-SERIES docs/qemu-server] machine version information Fiona Ebner
2023-11-10 13:24 ` [pve-devel] [PATCH docs 1/1] qm: add section about machine types Fiona Ebner
2023-11-10 13:24 ` [pve-devel] [PATCH qemu-server 1/6] machine: get current: improve naming and style Fiona Ebner
2023-11-10 13:24 ` Fiona Ebner [this message]
2023-11-10 13:24 ` [pve-devel] [PATCH qemu-server 3/6] machine: get current: return early from loop if possible Fiona Ebner
2023-11-10 13:24 ` [pve-devel] [PATCH qemu-server 4/6] machine: get current: add flag if current machine is deprecated in list context Fiona Ebner
2023-11-10 13:24 ` [pve-devel] [PATCH qemu-server 5/6] test: migration: mock get_current_qemu_machine Fiona Ebner
2023-11-10 13:24 ` [pve-devel] [PATCH qemu-server 6/6] vm start: add warning about deprecated machine version Fiona Ebner
2023-11-12 18:11 ` [pve-devel] applied-series: [PATCH-SERIES docs/qemu-server] machine version information 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=20231110132451.67482-4-f.ebner@proxmox.com \
    --to=f.ebner@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.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal