proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-13 22:40:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add statestorage parameter to suspend API

Browse Source 
this makes it possible to give a storage for state saving, if one
wants to use a different storage than for snapshots or does not
want to save this info into the config

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-03-14 17:04:50 +01:00 committed by Thomas Lamprecht
parent 22371fe00e
commit 48b4cdc210
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/API2/Qemu.pm
View File

@ -2355,6 +2355,12 @@ __PACKAGE__->register_method({
optional => 1, optional => 1,
description => 'If set, suspends the VM to disk. Will be resumed on next VM start.', description => 'If set, suspends the VM to disk. Will be resumed on next VM start.',
}, },
statestorage => get_standard_option('pve-storage-id', {
description => "The storage for the VM state",
requires => 'todisk',
optional => 1,
completion => \&PVE::Storage::complete_storage_enabled,
}),
}, },
}, },
returns => { returns => {
@ -2373,6 +2379,8 @@ __PACKAGE__->register_method({
my $todisk = extract_param($param, 'todisk') // 0; my $todisk = extract_param($param, 'todisk') // 0;
my $statestorage = extract_param($param, 'statestorage');
my $skiplock = extract_param($param, 'skiplock'); my $skiplock = extract_param($param, 'skiplock');
raise_param_exc({ skiplock => "Only root may use this option." }) raise_param_exc({ skiplock => "Only root may use this option." })
if $skiplock && $authuser ne 'root@pam'; if $skiplock && $authuser ne 'root@pam';
@ -2387,7 +2395,7 @@ __PACKAGE__->register_method({
syslog('info', "suspend VM $vmid: $upid\n"); syslog('info', "suspend VM $vmid: $upid\n");
PVE::QemuServer::vm_suspend($vmid, $skiplock, $todisk); PVE::QemuServer::vm_suspend($vmid, $skiplock, $todisk, $statestorage);
return; return;
}; };

5
PVE/QemuConfig.pm
View File

@ -116,10 +116,11 @@ sub get_replicatable_volumes {
} }
sub __snapshot_save_vmstate { sub __snapshot_save_vmstate {
my ($class, $vmid, $conf, $snapname, $storecfg, $suspend) = @_; my ($class, $vmid, $conf, $snapname, $storecfg, $statestorage, $suspend) = @_;
# first, use explicitly configured storage # first, use explicitly configured storage
my $target = $conf->{vmstatestorage}; # either directly via API, or via conf
my $target = $statestorage // $conf->{vmstatestorage};
if (!$target) { if (!$target) {
my ($shared, $local); my ($shared, $local);

4
PVE/QemuServer.pm
View File

@ -5679,7 +5679,7 @@ sub vm_stop {
} }
sub vm_suspend { sub vm_suspend {
my ($vmid, $skiplock, $includestate) = @_; my ($vmid, $skiplock, $includestate, $statestorage) = @_;
my $conf; my $conf;
my $path; my $path;
@ -5701,7 +5701,7 @@ sub vm_suspend {
$conf->{lock} = 'suspending'; $conf->{lock} = 'suspending';
my $date = strftime("%Y-%m-%d", localtime(time())); my $date = strftime("%Y-%m-%d", localtime(time()));
$storecfg = PVE::Storage::config(); $storecfg = PVE::Storage::config();
$vmstate = PVE::QemuConfig->__snapshot_save_vmstate($vmid, $conf, "suspend-$date", $storecfg, 1); $vmstate = PVE::QemuConfig->__snapshot_save_vmstate($vmid, $conf, "suspend-$date", $storecfg, $statestorage, 1);
$path = PVE::Storage::path($storecfg, $vmstate); $path = PVE::Storage::path($storecfg, $vmstate);
PVE::QemuConfig->write_config($vmid, $conf); PVE::QemuConfig->write_config($vmid, $conf);
} else { } else {