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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id A8ECB6920C for ; Mon, 1 Mar 2021 16:54:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 9D3C222A79 for ; Mon, 1 Mar 2021 16:53:33 +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 3161822A5F for ; Mon, 1 Mar 2021 16:53:32 +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 000E945833 for ; Mon, 1 Mar 2021 16:53:31 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 1 Mar 2021 16:53:25 +0100 Message-Id: <20210301155327.24841-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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: [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: Mon, 01 Mar 2021 15:54:03 -0000 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. -- 2.20.1