From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 519C974671 for ; Mon, 21 Jun 2021 18:36:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 350C21EE17 for ; Mon, 21 Jun 2021 18:35:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 12FBE1EDFC for ; Mon, 21 Jun 2021 18:35:49 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id D391142FEC for ; Mon, 21 Jun 2021 18:35:48 +0200 (CEST) From: Stefan Reiter To: pve-devel@lists.proxmox.com Date: Mon, 21 Jun 2021 18:35:42 +0200 Message-Id: <20210621163542.1752647-3-s.reiter@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210621163542.1752647-1-s.reiter@proxmox.com> References: <20210621163542.1752647-1-s.reiter@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.727 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH common 2/2] systemd: allow SendSIGKILL and TimeoutStopUSec dbus properties X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2021 16:36:21 -0000 Used in qemu-server for avoiding KillMode 'none'. SendSIGKILL is a boolean, so we need to use dbus_boolean to serialize it. Signed-off-by: Stefan Reiter --- src/PVE/Systemd.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/PVE/Systemd.pm b/src/PVE/Systemd.pm index e9712e0..2517d31 100644 --- a/src/PVE/Systemd.pm +++ b/src/PVE/Systemd.pm @@ -3,7 +3,7 @@ package PVE::Systemd; use strict; use warnings; -use Net::DBus qw(dbus_uint32 dbus_uint64); +use Net::DBus qw(dbus_uint32 dbus_uint64 dbus_boolean); use Net::DBus::Callback; use Net::DBus::Reactor; @@ -107,7 +107,9 @@ sub enter_systemd_scope { foreach my $key (keys %extra) { if ($key eq 'Slice' || $key eq 'KillMode') { push @{$properties}, [$key, $extra{$key}]; - } elsif ($key eq 'CPUShares' || $key eq 'CPUWeight') { + } elsif ($key eq 'SendSIGKILL') { + push @{$properties}, [$key, dbus_boolean($extra{$key})]; + } elsif ($key eq 'CPUShares' || $key eq 'CPUWeight' || $key eq 'TimeoutStopUSec') { push @{$properties}, [$key, dbus_uint64($extra{$key})]; } elsif ($key eq 'CPUQuota') { push @{$properties}, ['CPUQuotaPerSecUSec', -- 2.30.2