Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-02-15 05:57:39 +03:00
Code Releases Activity

start: fork before entering scope

Browse Source 
To avoid potential cleanup & post-start actions to cause
unwanted processes (such as gpg-agent) to be started as part
of the scope, as the enter_systemd_scope() function causes
the current process to enter the scope.

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-05-07 12:09:10 +02:00 committed by Thomas Lamprecht
parent 68e46b8452
commit 503308ed91
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuServer.pm
View File

@ -4841,6 +4841,13 @@ sub vm_start {
}
$properties{timeout} = 10 if $statefile; # setting up the scope shoul be quick
my $run_qemu = sub {
PVE::Tools::run_fork sub {
PVE::Tools::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %properties);
run_command($cmd, %run_params);
};
};
if ($conf->{hugepages}) {
my $code = sub {
@ -4850,11 +4857,7 @@ sub vm_start {
PVE::QemuServer::Memory::hugepages_mount();
PVE::QemuServer::Memory::hugepages_allocate($hugepages_topology, $hugepages_host_topology);
eval {
PVE::Tools::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %properties);
run_command($cmd, %run_params);
};
eval { $run_qemu->() };
if (my $err = $@) {
PVE::QemuServer::Memory::hugepages_reset($hugepages_host_topology);
die $err;
@ -4865,10 +4868,7 @@ sub vm_start {
eval { PVE::QemuServer::Memory::hugepages_update_locked($code); };
} else {
eval {
PVE::Tools::enter_systemd_scope($vmid, "Proxmox VE VM $vmid", %properties);
run_command($cmd, %run_params);
};
eval { $run_qemu->() };
}
if (my $err = $@) {