Fix #1924: add snapshot parameter

[qemu-server.git] / PVE / CLI / qm.pm

diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 46a7e2fd5beb9f54ba7849512e7fc3a95c4dde8b..f4bacd696121d94e973130ef67f3b2911906575c 100755 (executable)
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -18,6 +18,7 @@ use PVE::SafeSyslog;
 use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::Exception qw(raise_param_exc);
+use PVE::Network;
 use PVE::QemuServer;
 use PVE::QemuServer::ImportDisk;
 use PVE::QemuServer::OVF;
@@ -126,7 +127,15 @@ __PACKAGE__->register_method ({
                type => 'boolean',
                optional => 1,
                default => 0,
-           }
+           },
+           snapshot => get_standard_option('pve-snapshot-name', {
+               description => "Fetch config values from given snapshot.",
+               optional => 1,
+               completion => sub {
+                   my ($cmd, $pname, $cur, $args) = @_;
+                   PVE::QemuConfig->snapshot_list($args->[0]);
+               }
+           }),
        },
     },
     returns => { type => 'null'},
@@ -134,7 +143,7 @@ __PACKAGE__->register_method ({
        my ($param) = @_;
 
        my $storecfg = PVE::Storage::config();
-       my $cmdline = PVE::QemuServer::vm_commandline($storecfg, $param->{vmid});
+       my $cmdline = PVE::QemuServer::vm_commandline($storecfg, $param->{vmid}, $param->{snapshot});
 
        $cmdline =~ s/ -/ \\\n  -/g if $param->{pretty};
 
@@ -722,6 +731,68 @@ __PACKAGE__->register_method({
        return { result => $res };
     }});
 
+__PACKAGE__->register_method({
+    name => 'cleanup',
+    path => 'cleanup',
+    method => 'POST',
+    protected => 1,
+    description => "Cleans up resources like tap devices, vgpus, etc. Called after a vm shuts down, crashes, etc.",
+    parameters => {
+       additionalProperties => 0,
+       properties => {
+           node => get_standard_option('pve-node'),
+           vmid => get_standard_option('pve-vmid', {
+                   completion => \&PVE::QemuServer::complete_vmid_running }),
+           'clean-shutdown' => {
+               type => 'boolean',
+               description => "Indicates if qemu shutdown cleanly.",
+           },
+           'guest-requested' => {
+               type => 'boolean',
+               description => "Indicates if the shutdown was requested by the guest or via qmp.",
+           },
+       },
+    },
+    returns => { type => 'null', },
+    code => sub {
+       my ($param) = @_;
+
+       my $vmid = $param->{vmid};
+       my $clean = $param->{'clean-shutdown'};
+       my $guest = $param->{'guest-requested'};
+
+       # return if we do not have the config anymore
+       return if !-f PVE::QemuConfig->config_file($vmid);
+
+       my $storecfg = PVE::Storage::config();
+       warn "Starting cleanup for $vmid\n";
+
+       PVE::QemuConfig->lock_config($vmid, sub {
+           my $conf = PVE::QemuConfig->load_config ($vmid);
+           my $pid = PVE::QemuServer::check_running ($vmid);
+           die "vm still running\n" if $pid;
+
+           if (!$clean) {
+               # we have to cleanup the tap devices after a crash
+
+               foreach my $opt (keys %$conf) {
+                   next if $opt !~  m/^net(\d)+$/;
+                   my $interface = $1;
+                   PVE::Network::tap_unplug("tap${vmid}i${interface}");
+               }
+           }
+
+           if (!$clean || $guest) {
+               # vm was shutdown from inside the guest or crashed, doing api cleanup
+               PVE::QemuServer::vm_stop_cleanup($storecfg, $vmid, $conf, 0, 0);
+           }
+       });
+
+       warn "Finished cleanup for $vmid\n";
+
+       return undef;
+    }});
+
 my $print_agent_result = sub {
     my ($data) = @_;
 
@@ -904,6 +975,8 @@ our $cmddef = {
 
     importovf => [ __PACKAGE__, 'importovf', ['vmid', 'manifest', 'storage']],
 
+    cleanup => [ __PACKAGE__, 'cleanup', ['vmid', 'clean-shutdown', 'guest-requested'], { node => $nodename }],
+
 };
 
 1;