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

Add 'runningmachine' support to vm_commandline

Browse Source 
to allow 'qm showcmd --snapshot ...' to show the correct machine type.

Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
This commit is contained in:
Stefan Reiter 2019-11-20 13:24:56 +01:00 committed by Thomas Lamprecht
parent e85d01f282
commit 092868c4d1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/QemuServer.pm
View File

@ -5626,11 +5626,15 @@ sub vm_commandline {
my ($storecfg, $vmid, $snapname) = @_; my ($storecfg, $vmid, $snapname) = @_;
my $conf = PVE::QemuConfig->load_config($vmid); my $conf = PVE::QemuConfig->load_config($vmid);
my $forcemachine;
if ($snapname) { if ($snapname) {
my $snapshot = $conf->{snapshots}->{$snapname}; my $snapshot = $conf->{snapshots}->{$snapname};
die "snapshot '$snapname' does not exist\n" if !defined($snapshot); 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 $snapshot->{digest} = $conf->{digest}; # keep file digest for API
$conf = $snapshot; $conf = $snapshot;
@ -5638,7 +5642,7 @@ sub vm_commandline {
my $defaults = load_defaults(); 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); return PVE::Tools::cmd2string($cmd);
} }