Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-09-06 17:44:22 +03:00
Code Releases Activity

snapshot rollback: use pc-i440fx-1.4 as default

Browse Source
This commit is contained in:
Dietmar Maurer
2013-06-06 06:38:12 +02:00
parent 6dbe8b459b
commit d8b916fdb0
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/QemuServer.pm
View File

@@ -4340,7 +4340,9 @@ sub snapshot_rollback {
$conf = &$snapshot_apply_config($conf, $snap); $conf = &$snapshot_apply_config($conf, $snap);
$conf->{parent} = $snapname; $conf->{parent} = $snapname;
$forcemachine = $conf->{machine}; # Note: old code did not store 'machine', so we try to be smart
# and guess the snapshot was generated with kvm 1.4 (pc-i440fx-1.4).
$forcemachine = $conf->{machine} || 'pc-i440fx-1.4';
# we remove the 'machine' configuration if not explicitly specified # we remove the 'machine' configuration if not explicitly specified
# in the original config. # in the original config.
delete $conf->{machine} if $snap->{vmstate} && !$has_machine_config; delete $conf->{machine} if $snap->{vmstate} && !$has_machine_config;