From 092868c4d152e137686879b09ac832b41dc4e5a1 Mon Sep 17 00:00:00 2001 From: Stefan Reiter Date: Wed, 20 Nov 2019 13:24:56 +0100 Subject: [PATCH] Add 'runningmachine' support to vm_commandline to allow 'qm showcmd --snapshot ...' to show the correct machine type. Signed-off-by: Stefan Reiter --- PVE/QemuServer.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 2a3d6df6..c28e7b43 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5626,11 +5626,15 @@ sub vm_commandline { my ($storecfg, $vmid, $snapname) = @_; my $conf = PVE::QemuConfig->load_config($vmid); + my $forcemachine; if ($snapname) { my $snapshot = $conf->{snapshots}->{$snapname}; die "snapshot '$snapname' does not exist\n" if !defined($snapshot); + # check for a 'runningmachine' in snapshot + $forcemachine = $snapshot->{runningmachine} if $snapshot->{runningmachine}; + $snapshot->{digest} = $conf->{digest}; # keep file digest for API $conf = $snapshot; @@ -5638,7 +5642,7 @@ sub vm_commandline { my $defaults = load_defaults(); - my $cmd = config_to_command($storecfg, $vmid, $conf, $defaults); + my $cmd = config_to_command($storecfg, $vmid, $conf, $defaults, $forcemachine); return PVE::Tools::cmd2string($cmd); }