proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-10-04 17:30:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

resume suspended vm on start

Browse Source 
if a vm has the 'suspended' lock, we resume with the saved state
and remove the lock, the saved vmstate and the saved runningmachine
after the vm started

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

23
PVE/QemuServer.pm
View File

@ -3998,6 +3998,12 @@ sub config_to_command {
push @$cmd, '-global', join(',', @$globalFlags) push @$cmd, '-global', join(',', @$globalFlags)
if scalar(@$globalFlags); if scalar(@$globalFlags);
if (my $vmstate = $conf->{vmstate}) {
my $statepath = PVE::Storage::path($storecfg, $vmstate);
PVE::Storage::activate_volumes($storecfg, [$vmstate]);
push @$cmd, '-loadstate', $statepath;
}
# add custom args # add custom args
if ($conf->{args}) { if ($conf->{args}) {
my $aa = PVE::Tools::split_args($conf->{args}); my $aa = PVE::Tools::split_args($conf->{args});
@ -5148,7 +5154,10 @@ sub vm_start {
die "you can't start a vm if it's a template\n" if PVE::QemuConfig->is_template($conf); die "you can't start a vm if it's a template\n" if PVE::QemuConfig->is_template($conf);
PVE::QemuConfig->check_lock($conf) if !$skiplock; my $is_suspended = PVE::QemuConfig->has_lock($conf, 'suspended');
PVE::QemuConfig->check_lock($conf)
if !($skiplock || $is_suspended);
die "VM $vmid already running\n" if check_running($vmid, undef, $migratedfrom); die "VM $vmid already running\n" if check_running($vmid, undef, $migratedfrom);
@ -5214,6 +5223,11 @@ sub vm_start {
PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-start', 1); PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'pre-start', 1);
if ($is_suspended) {
# enforce machine type on suspended vm to ensure HW compatibility
$forcemachine = $conf->{runningmachine};
}
my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine); my ($cmd, $vollist, $spice_port) = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine);
my $migrate_port = 0; my $migrate_port = 0;
@ -5411,6 +5425,13 @@ sub vm_start {
property => "guest-stats-polling-interval", property => "guest-stats-polling-interval",
value => 2) if (!defined($conf->{balloon}) || $conf->{balloon}); value => 2) if (!defined($conf->{balloon}) || $conf->{balloon});
if ($is_suspended && (my $vmstate = $conf->{vmstate})) {
delete $conf->@{qw(lock vmstate runningmachine)};
PVE::Storage::deactivate_volumes($storecfg, [$vmstate]);
PVE::Storage::vdisk_free($storecfg, $vmstate);
PVE::QemuConfig->write_config($vmid, $conf);
}
PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'post-start'); PVE::GuestHelpers::exec_hookscript($conf, $vmid, 'post-start');
}); });
} }