From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id 253A61FF162
for <inbox@lore.proxmox.com>; Sat, 22 Mar 2025 16:31:15 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id B3A3F3C5B4;
Sat, 22 Mar 2025 16:31:04 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 00:17:19 +0900
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Message-ID: <mailman.92.1742657463.359.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Jing Luo via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Jing Luo <jing@jing.rocks>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] [PATCH qemu-server] tree-wide: change /var/run to /run
and /var/lock to /run/lock
Content-Type: multipart/mixed; boundary="===============1628971884275870679=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============1628971884275870679==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <jing@jing.rocks>
X-Original-To: pve-devel@lists.proxmox.com
Delivered-To: pve-devel@lists.proxmox.com
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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 0C4E4C944B
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:31:03 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 1EA2A3C362
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:32 +0100 (CET)
Received: from mail-gw3.jing.rocks (mail-gw3.jing.rocks [219.117.250.209])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:27 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
by mail-gw3.jing.rocks (Proxmox) with ESMTP id B8462164F3
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:23 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jing.rocks; h=cc
:cc:content-transfer-encoding:date:from:from:in-reply-to
:message-id:mime-version:references:reply-to:subject:subject:to
:to; s=mail-gw; bh=+BDxtf32J9gPT2O0w9gELa06zP4v6lrQo4eK0K38aYo=; b=
bBViTMQqWJ+UYp6wCqibDG+SXza6r0VUTPeHzRS3LTGdZgh1s9fDn/8z+FrWu34m
d4HlhKeyKgSlh9LLQoNzbhyz5f4r3aKubhVDAlLw4IEjTv45JNcG6jolBQT5QcSJ
qsQV312IPZ2yyyvmkxJXPNvjvB7+paY3LJSZwGdygzyVjMCivPZTIkab2aGKRjLf
VbU01U7dlqiM0pgaHtiNYnNwLDqhFtWV8reUieIJKqiyNrkov0HwTRWbR0zvmUqf
L8NOT1ZDbkBPaAbEIRseXdemD0DVDItz4ce3TgmJJT/agsolgf2bLm8ot1gfbWVm
EBJTB+DXsKdBNbTokH3DLw==
Received: from mail.jing.rocks (mail.jing.rocks [192.168.0.222])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by mail-gw3.jing.rocks (Proxmox) with ESMTPS id CB3F7165F1
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:22 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
s=default; t=1742656822;
bh=24oaaOEwvU9O/2J5/wVBjmIo3DFvQVCzXk01kWUCGe8=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=dgPu5rN61etEQzTU6YTRVkg02qar2Kdg8+OLKUwh2ImtKd++0ztT1ywM0vLKGnitF
yiePPaHFfcqjir74Ia8Vt5ybyBktwLqNIT3O91kf5O/584RUUuC0+UiDiYGit5PWhv
Vtlhq1/DRzEyokt5EQGhK3oarH/ZyAMKOK9CzeKDsvNxtS1r8/nA3KgN2Qa1XgDq+H
UtzvJs6B2lXCkHgQnOPIWbogD30AfoFZRxIKhlTiED+dRcZvyBr3ZUFfoEcOdQmr2L
GW5mtuZCUhHrC4tYYF0zBn/nfecmAIuqUV7omI6XhoqCNcugU7uHD1wHJRX8XEHJHr
8iXsedD8B9WSw==
Received: from X570AM.jing.rocks (X570AM.lan [IPv6:240b:10:f00:1b00::7e82])
(Authenticated sender: jing@jing.rocks)
by mail.jing.rocks (Postfix) with ESMTPSA id C5B5F37F46;
Sun, 23 Mar 2025 00:20:22 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH qemu-server] tree-wide: change /var/run to /run and /var/lock to /run/lock
Date: Sun, 23 Mar 2025 00:17:19 +0900
Message-ID: <20250322152004.1646886-12-jing@jing.rocks>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.000 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain
DMARC_PASS -0.1 DMARC pass policy
KAM_INFOUSMEBIZ 0.75 Prevalent use of .info|.us|.me|.me.uk|.biz|xyz|id|rocks|life domains in spam/malware
KAM_OTHER_BAD_TLD 0.75 Other untrustworthy TLDs
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
"/var/run" and "/var/lock" are deprecated.
This is to comply with Debian Policy 9.1.4 "/run and /run/lock".
(https://www.debian.org/doc/debian-policy/ch-opersys.html#run-and-run-lock)
Signed-off-by: Jing Luo <jing@jing.rocks>
---
PVE/CLI/qm.pm | 2 +-
PVE/QemuConfig.pm | 2 +-
PVE/QemuServer.pm | 14 +++++++-------
PVE/QemuServer/Helpers.pm | 2 +-
PVE/QemuServer/Memory.pm | 2 +-
qmeventd/qmeventd.service | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 4214a7ca..5e1321c6 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -703,7 +703,7 @@ __PACKAGE__->register_method ({
die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
- my $socket = "/var/run/qemu-server/${vmid}.$iface";
+ my $socket = "/run/qemu-server/${vmid}.$iface";
my $cmd = "socat UNIX-CONNECT:$socket STDIO,raw,echo=0$escape";
diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm
index ffdf9f03..b414db99 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -24,7 +24,7 @@ my $nodename = PVE::INotify::nodename();
mkdir "/etc/pve/nodes/$nodename";
mkdir "/etc/pve/nodes/$nodename/qemu-server";
-my $lock_dir = "/var/lock/qemu-server";
+my $lock_dir = "/run/lock/qemu-server";
mkdir $lock_dir;
sub assert_config_exists_on_node {
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 5bb86f7a..268140ce 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3204,8 +3204,8 @@ sub audio_devs {
sub get_tpm_paths {
my ($vmid) = @_;
return {
- socket => "/var/run/qemu-server/$vmid.swtpm",
- pid => "/var/run/qemu-server/$vmid.swtpm.pid",
+ socket => "/run/qemu-server/$vmid.swtpm",
+ pid => "/run/qemu-server/$vmid.swtpm.pid",
};
}
@@ -3461,7 +3461,7 @@ sub query_supported_cpu_flags {
$qemu_cmd,
'-machine', $default_machine,
'-display', 'none',
- '-chardev', "socket,id=qmp,path=/var/run/qemu-server/$fakevmid.qmp,server=on,wait=off",
+ '-chardev', "socket,id=qmp,path=/run/qemu-server/$fakevmid.qmp,server=on,wait=off",
'-mon', 'chardev=qmp,mode=control',
'-pidfile', $pidfile,
'-S', '-daemonize'
@@ -3710,7 +3710,7 @@ sub config_to_command {
push @$cmd, '-mon', "chardev=qmp,mode=control";
if (min_version($machine_version, 2, 12)) {
- push @$cmd, '-chardev', "socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5";
+ push @$cmd, '-chardev', "socket,id=qmp-event,path=/run/qmeventd.sock,reconnect=5";
push @$cmd, '-mon', "chardev=qmp-event,mode=control";
}
@@ -3812,7 +3812,7 @@ sub config_to_command {
for (my $i = 0; $i < $MAX_SERIAL_PORTS; $i++) {
my $path = $conf->{"serial$i"} or next;
if ($path eq 'socket') {
- my $socket = "/var/run/qemu-server/${vmid}.serial$i";
+ my $socket = "/run/qemu-server/${vmid}.serial$i";
push @$devices, '-chardev', "socket,id=serial$i,path=$socket,server=on,wait=off";
# On aarch64, serial0 is the UART device. QEMU only allows
# connecting UART devices via the '-serial' command line, as
@@ -6330,7 +6330,7 @@ sub vm_stop_cleanup {
}
foreach my $ext (qw(mon qmp pid vnc qga)) {
- unlink "/var/run/qemu-server/${vmid}.$ext";
+ unlink "/run/qemu-server/${vmid}.$ext";
}
if ($conf->{ivshmem}) {
@@ -8789,7 +8789,7 @@ sub register_qmeventd_handle {
my ($vmid) = @_;
my $fh;
- my $peer = "/var/run/qmeventd.sock";
+ my $peer = "/run/qmeventd.sock";
my $count = 0;
for (;;) {
diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm
index 72a46a0a..a27fcfdd 100644
--- a/PVE/QemuServer/Helpers.pm
+++ b/PVE/QemuServer/Helpers.pm
@@ -21,7 +21,7 @@ my $nodename = PVE::INotify::nodename();
# Paths and directories
-our $var_run_tmpdir = "/var/run/qemu-server";
+our $var_run_tmpdir = "/run/qemu-server";
mkdir $var_run_tmpdir;
sub qmp_socket {
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index e5024cd2..d87b3a06 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -726,7 +726,7 @@ sub hugepages_update_locked {
my $timeout = 60; #could be long if a lot of hugepages need to be allocated
- my $lock_filename = "/var/lock/hugepages.lck";
+ my $lock_filename = "/run/lock/hugepages.lck";
my $res = lock_file($lock_filename, $timeout, $code, @param);
die $@ if $@;
diff --git a/qmeventd/qmeventd.service b/qmeventd/qmeventd.service
index 1e2465be..d692d1a0 100644
--- a/qmeventd/qmeventd.service
+++ b/qmeventd/qmeventd.service
@@ -1,11 +1,11 @@
[Unit]
Description=PVE Qemu Event Daemon
-RequiresMountsFor=/var/run
+RequiresMountsFor=/run
Before=pve-ha-lrm.service
Before=pve-guests.service
[Service]
-ExecStart=/usr/sbin/qmeventd /var/run/qmeventd.sock
+ExecStart=/usr/sbin/qmeventd /run/qmeventd.sock
Type=forking
[Install]
--
2.49.0
--===============1628971884275870679==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
--===============1628971884275870679==--