From bda0ebff2d50512b38e9d9c8a2bb4dd4ef691db8 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 15 Oct 2021 17:02:21 +0200
Subject: [PATCH] pci reservation: move lock/reservation file into
 /run/qemu-server

lck needs to die, the days of any 8.3 file naming schemes are long
gone (in the server space that is ;)

/var/run is /run so use the shorter, and while /var/lock is a OK
place for the locks we try to keep lock and lock-object together
nowadays. The qemu-server sub-directory avoids overly cluttering the
already crowded top-level /run dir

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/QemuServer/PCI.pm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/PVE/QemuServer/PCI.pm b/PVE/QemuServer/PCI.pm
index 31363688..ebb50ec3 100644
--- a/PVE/QemuServer/PCI.pm
+++ b/PVE/QemuServer/PCI.pm
@@ -485,8 +485,9 @@ sub prepare_pci_device {
     }
 }
 
-my $PCIID_RESERVATION_FILE = "/var/run/pve-reserved-pciids";
-my $PCIID_RESERVATION_LCK = "/var/lock/pve-reserved-pciids.lck";
+my $RUNDIR = '/run/qemu-server';
+my $PCIID_RESERVATION_FILE = "${RUNDIR}/pci-id-reservations";
+my $PCIID_RESERVATION_LOCK = "${PCIID_RESERVATION_FILE}.lock";
 
 my $parse_pci_reservation_unlocked = sub {
     my $pciids = {};
@@ -536,7 +537,7 @@ sub remove_pci_reservation {
 	$write_pci_reservation_unlocked->($pciids);
     };
 
-    PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, $code);
+    PVE::Tools::lock_file($PCIID_RESERVATION_LOCK, 10, $code);
     die $@ if $@;
 
     return;
@@ -547,7 +548,7 @@ sub reserve_pci_usage {
 
     return if !scalar(@$ids); # do nothing for empty list
 
-    PVE::Tools::lock_file($PCIID_RESERVATION_LCK, 10, sub {
+    PVE::Tools::lock_file($PCIID_RESERVATION_LOCK, 10, sub {
 
 	my $ctime = time();
 	my $pciids = $parse_pci_reservation_unlocked->();