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

Fix #2171: vm_start: volid based statefiles were not activated

Browse Source 
So, while we could just make this a special case before the
config_to_command call and set the $conf->{vmstate} to the statefile
for the case were it's a valid volumeid, the special case handling
get's much easier when we do this outside of that method.

So it's basically a trade-off, and after looking far to long at all
nice revisions Alwin made for me and Fabians request, and even trying
out different approaches, it was never perfect.

But having slight code duplication over the movement mess I proposed
(as I did not had the full picture then, sorry Alwin) felt like the
slightly nicer trade off, as all worked I just use this one now, it
has very clear semantics, easy to understand and that now three lines
are duplicated is IMO irrelevant.

Co-developed-by: Alwin Antreich <a.antreich@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
(cherry picked from commit 5c1d42b7f8)
[squashed the two fixups from master into this one]
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2019-10-17 19:13:01 +02:00
parent c4cabf8735
commit a01119dd51
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
PVE/QemuConfig.pm
View File

@ -359,8 +359,7 @@ sub __snapshot_rollback_vm_start {
my ($class, $vmid, $vmstate, $data) = @_;
my $storecfg = PVE::Storage::config();
my $statefile = PVE::Storage::path($storecfg, $vmstate);
PVE::QemuServer::vm_start($storecfg, $vmid, $statefile, undef, undef, undef, $data->{forcemachine});
PVE::QemuServer::vm_start($storecfg, $vmid, $vmstate, undef, undef, undef, $data->{forcemachine});
}
sub __snapshot_rollback_get_unused {

8
PVE/QemuServer.pm
View File

@ -4001,7 +4001,7 @@ sub config_to_command {
if (my $vmstate = $conf->{vmstate}) {
my $statepath = PVE::Storage::path($storecfg, $vmstate);
push @$vollist, $statepath;
push @$vollist, $vmstate;
push @$cmd, '-loadstate', $statepath;
}
@ -5277,8 +5277,12 @@ sub vm_start {
push @$cmd, '-incoming', $migrate_uri;
push @$cmd, '-S';
} else {
} elsif (-e $statefile) {
push @$cmd, '-loadstate', $statefile;
} else {
my $statepath = PVE::Storage::path($storecfg, $statefile);
push @$vollist, $statefile;
push @$cmd, '-loadstate', $statepath;
}
} elsif ($paused) {
push @$cmd, '-S';