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 85877716AE for ; Thu, 8 Apr 2021 12:33:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 65C6119F7C for ; Thu, 8 Apr 2021 12:33:22 +0200 (CEST) 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 8F8F819F42 for ; Thu, 8 Apr 2021 12:33:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5747641F51 for ; Thu, 8 Apr 2021 12:33:20 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Thu, 8 Apr 2021 12:33:11 +0200 Message-Id: <20210408103316.7619-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210408103316.7619-1-f.ebner@proxmox.com> References: <20210408103316.7619-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [qemuconfig.pm, qemuserver.pm] Subject: [pve-devel] [POC qemu-server 1/6] create vmstate_size helper 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, 08 Apr 2021 10:33:52 -0000 Signed-off-by: Fabian Ebner --- PVE/QemuConfig.pm | 10 ++-------- PVE/QemuServer.pm | 13 +++++++++++++ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm index 7ee8876..01c51b0 100644 --- a/PVE/QemuConfig.pm +++ b/PVE/QemuConfig.pm @@ -208,14 +208,8 @@ sub __snapshot_save_vmstate { $target = PVE::QemuServer::find_vmstate_storage($conf, $storecfg); } - my $defaults = PVE::QemuServer::load_defaults(); - my $mem_size = $conf->{memory} // $defaults->{memory}; - my $driver_state_size = 500; # assume 500MB is enough to safe all driver state; - # our savevm-start does live-save of the memory until the space left in the - # volume is just enough for the remaining memory content + internal state - # then it stops the vm and copies the rest so we reserve twice the - # memory content + state to minimize vm downtime - my $size = $mem_size*2 + $driver_state_size; + my $size = PVE::QemuServer::vmstate_size($conf); + my $scfg = PVE::Storage::storage_config($storecfg, $target); my $name = "vm-$vmid-state-$snapname"; diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index fdb2ac9..5a89853 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7710,4 +7710,17 @@ sub vm_is_paused { return $qmpstatus && $qmpstatus->{status} eq "paused"; } +sub vmstate_size { + my ($conf) = @_; + + my $defaults = PVE::QemuServer::load_defaults(); + my $mem_size = $conf->{memory} // $defaults->{memory}; + my $driver_state_size = 500; # assume 500MB is enough to safe all driver state; + # our savevm-start does live-save of the memory until the space left in the + # volume is just enough for the remaining memory content + internal state + # then it stops the vm and copies the rest so we reserve twice the + # memory content + state to minimize vm downtime + return $mem_size*2 + $driver_state_size; +} + 1; -- 2.20.1