use enter_systemd_scope instead of systemd-run

[qemu-server.git] / PVE / QemuServer.pm

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 2da9208c6b7e8e1058a0608bd49a755b5bde11fc..9c1dd568cdff98721c1ddcdf17382a87abed9c2c 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2730,20 +2730,6 @@ sub config_to_command {
     my $cpuunits = defined($conf->{cpuunits}) ?
             $conf->{cpuunits} : $defaults->{cpuunits};
 
-    push @$cmd, '/usr/bin/systemd-run';
-    push @$cmd, '--scope';
-    push @$cmd, '--slice', "qemu";
-    push @$cmd, '--unit', $vmid;
-    push @$cmd, '--description', "'Proxmox VE VM $vmid'";
-    # set KillMode=none, so that systemd don't kill those scopes
-    # at shutdown (pve-manager service should stop the VMs instead)
-    push @$cmd, '-p', "KillMode=none";
-    push @$cmd, '-p', "CPUShares=$cpuunits";
-    if ($conf->{cpulimit}) {
-       my $cpulimit = int($conf->{cpulimit} * 100);
-       push @$cmd, '-p', "CPUQuota=$cpulimit\%";
-    }
-
     push @$cmd, '/usr/bin/kvm';
 
     push @$cmd, '-id', $vmid;
@@ -4346,8 +4332,22 @@ sub vm_start {
            eval  { run_command($cmd); };
        }
 
-       eval  { run_command($cmd, timeout => $statefile ? undef : 30,
-                   umask => 0077); };
+       my $cpuunits = defined($conf->{cpuunits}) ? $conf->{cpuunits}
+                                                 : $defaults->{cpuunits};
+
+       eval  {
+           my %properties = (
+               Slice => 'qemu.slice',
+               KillMode => 'none',
+               CPUShares => $cpuunits
+           );
+           if (my $cpulimit = $conf->{cpulimit}) {
+               $properties{CPUQuota} = int($cpulimit * 100);
+           }
+           $properties{timeout} = 10 if $statefile; # setting up the scope shoul be quick
+           PVE::Tools::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %properties);
+           run_command($cmd, timeout => $statefile ? undef : 30, umask => 0077);
+       };
 
        if (my $err = $@) {
            # deactivate volumes if start fails