proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-08-07 18:36:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

snapshot: save/restore 'machine' configuration

Browse Source
This commit is contained in:
Dietmar Maurer 2013-06-05 10:17:49 +02:00
parent ff556cf2a0
commit 4b15803dee
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
PVE/QemuServer.pm
View File

@ -4252,6 +4252,10 @@ my $snapshot_prepare = sub {
$snap->{snaptime} = time(); $snap->{snaptime} = time();
$snap->{description} = $comment if $comment; $snap->{description} = $comment if $comment;
# always overwrite machine if we save vmstate. This makes sure we
# can restore it later using correct machine type
$snap->{machine} = get_current_qemu_machine($vmid) if $snap->{vmstate};
update_config_nolock($vmid, $conf, 1); update_config_nolock($vmid, $conf, 1);
}; };
@ -4327,17 +4331,26 @@ sub snapshot_rollback {
delete $conf->{lock}; delete $conf->{lock};
} }
my $forcemachine;
if (!$prepare) { if (!$prepare) {
my $has_machine_config = defined($conf->{machine});
# copy snapshot config to current config # copy snapshot config to current config
$conf = &$snapshot_apply_config($conf, $snap); $conf = &$snapshot_apply_config($conf, $snap);
$conf->{parent} = $snapname; $conf->{parent} = $snapname;
$forcemachine = $conf->{machine};
# we remove the 'machine' configuration if not explicitly specified
# in the original config.
delete $conf->{machine} if $snap->{vmstate} && !$has_machine_config;
} }
update_config_nolock($vmid, $conf, 1); update_config_nolock($vmid, $conf, 1);
if (!$prepare && $snap->{vmstate}) { if (!$prepare && $snap->{vmstate}) {
my $statefile = PVE::Storage::path($storecfg, $snap->{vmstate}); my $statefile = PVE::Storage::path($storecfg, $snap->{vmstate});
vm_start($storecfg, $vmid, $statefile); vm_start($storecfg, $vmid, $statefile, undef, undef, undef, $forcemachine);
} }
}; };