From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A6ECD6A256 for ; Thu, 4 Mar 2021 13:51:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 967071A586 for ; Thu, 4 Mar 2021 13:51:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 76A451A576 for ; Thu, 4 Mar 2021 13:51:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 437414627B for ; Thu, 4 Mar 2021 13:51:26 +0100 (CET) To: Proxmox VE development discussion , Fabian Ebner References: <20210301155327.24841-1-f.ebner@proxmox.com> From: Stefan Reiter Message-ID: <6d7ed73f-3c13-ccf0-2f52-01db26457eec@proxmox.com> Date: Thu, 4 Mar 2021 13:51:25 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210301155327.24841-1-f.ebner@proxmox.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH qemu-server 1/3] machine: split out helper for handling query-machines qmp command result X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Mar 2021 12:51:27 -0000 LGTM, for both qemu-server patches: Reviewed-by: Stefan Reiter Not sure about the formatting in the GUI, but I'm also the wrong person to ask there. Maybe don't capitalize "Qemu", as we also don't do that for "running"/"stopped"/... either? On 01/03/2021 16:53, Fabian Ebner wrote: > to be re-used in the vmstatus() call. > > Signed-off-by: Fabian Ebner > --- > PVE/QemuServer/Machine.pm | 16 +++++++++++----- > 1 file changed, 11 insertions(+), 5 deletions(-) > > diff --git a/PVE/QemuServer/Machine.pm b/PVE/QemuServer/Machine.pm > index c168ade..2474951 100644 > --- a/PVE/QemuServer/Machine.pm > +++ b/PVE/QemuServer/Machine.pm > @@ -18,11 +18,8 @@ sub machine_type_is_q35 { > return $conf->{machine} && ($conf->{machine} =~ m/q35/) ? 1 : 0; > } > > -# this only works if VM is running > -sub get_current_qemu_machine { > - my ($vmid) = @_; > - > - my $res = PVE::QemuServer::Monitor::mon_cmd($vmid, 'query-machines'); > +sub current_from_query_machines { > + my ($res) = @_; > > my ($current, $pve_version, $default); > foreach my $e (@$res) { > @@ -37,6 +34,15 @@ sub get_current_qemu_machine { > return $current || $default || 'pc'; > } > > +# this only works if VM is running > +sub get_current_qemu_machine { > + my ($vmid) = @_; > + > + my $res = PVE::QemuServer::Monitor::mon_cmd($vmid, 'query-machines'); > + > + return current_from_query_machines($res); > +} > + > # returns a string with major.minor+pve, patch version-part is ignored > # as it's seldom ressembling a real QEMU machine type, so it would be '0' 99% of > # the time anyway.. This explicitly separates pveversion from the machine. >