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 B76D5691D0 for ; Mon, 1 Mar 2021 16:53:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B3DA422A7F 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 4B40822A6C 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 1617445830 for ; Mon, 1 Mar 2021 16:53:32 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Mon, 1 Mar 2021 16:53:26 +0100 Message-Id: <20210301155327.24841-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210301155327.24841-1-f.ebner@proxmox.com> References: <20210301155327.24841-1-f.ebner@proxmox.com> 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 2/3] fix #3301: status: add currently running machine and QEMU version to full status 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:53:33 -0000 Signed-off-by: Fabian Ebner --- PVE/QemuServer.pm | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a498444..e866faa 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2555,6 +2555,16 @@ our $vmstatus_return_properties = { type => 'string', optional => 1, }, + 'running-machine' => { + description => "The currently running machine type (if running).", + type => 'string', + optional => 1, + }, + 'running-qemu' => { + description => "The currently running QEMU version (if running).", + type => 'string', + optional => 1, + }, }; my $last_proc_pid_stat; @@ -2733,10 +2743,32 @@ sub vmstatus { $res->{$vmid}->{diskwrite} = $totalwrbytes; }; + my $machinecb = sub { + my ($vmid, $resp) = @_; + my $data = $resp->{'return'} || []; + + $res->{$vmid}->{'running-machine'} = + PVE::QemuServer::Machine::current_from_query_machines($data); + }; + + my $versioncb = sub { + my ($vmid, $resp) = @_; + my $data = $resp->{'return'} // {}; + my $version = 'unknown'; + + if (my $v = $data->{qemu}) { + $version = $v->{major} . "." . $v->{minor} . "." . $v->{micro}; + } + + $res->{$vmid}->{'running-qemu'} = $version; + }; + my $statuscb = sub { my ($vmid, $resp) = @_; $qmpclient->queue_cmd($vmid, $blockstatscb, 'query-blockstats'); + $qmpclient->queue_cmd($vmid, $machinecb, 'query-machines'); + $qmpclient->queue_cmd($vmid, $versioncb, 'query-version'); # this fails if ballon driver is not loaded, so this must be # the last commnand (following command are aborted if this fails). $qmpclient->queue_cmd($vmid, $ballooncb, 'query-balloon'); -- 2.20.1