In particular, a function to get the path to the PID file and a function to check whether the qemu-storage-daemon instance is running.
Signed-off-by: Fiona Ebner <[email protected]> --- Changes in v2: * Use ID instead of VM ID for QSD peer. src/PVE/QemuServer.pm | 4 ++-- src/PVE/QemuServer/Helpers.pm | 33 ++++++++++++++++++++++++++------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index e8bce20f..66fc3231 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -2944,7 +2944,7 @@ sub query_supported_cpu_flags { my $kvm_supported = defined(kvm_version()); my $qemu_cmd = PVE::QemuServer::Helpers::get_command_for_arch($arch); my $fakevmid = -1; - my $pidfile = PVE::QemuServer::Helpers::pidfile_name($fakevmid); + my $pidfile = PVE::QemuServer::Helpers::vm_pidfile_name($fakevmid); # Start a temporary (frozen) VM with vmid -1 to allow sending a QMP command my $query_supported_run_qemu = sub { @@ -3198,7 +3198,7 @@ sub config_to_command { push @$cmd, '-mon', "chardev=qmp-event,mode=control"; } - push @$cmd, '-pidfile', PVE::QemuServer::Helpers::pidfile_name($vmid); + push @$cmd, '-pidfile', PVE::QemuServer::Helpers::vm_pidfile_name($vmid); push @$cmd, '-daemonize'; diff --git a/src/PVE/QemuServer/Helpers.pm b/src/PVE/QemuServer/Helpers.pm index 87f4f841..ce9c352a 100644 --- a/src/PVE/QemuServer/Helpers.pm +++ b/src/PVE/QemuServer/Helpers.pm @@ -84,7 +84,12 @@ sub qmp_socket { return "${var_run_tmpdir}/${id}.${type}"; } -sub pidfile_name { +sub qsd_pidfile_name { + my ($id) = @_; + return "${var_run_tmpdir}/qsd-${id}.pid"; +} + +sub vm_pidfile_name { my ($vmid) = @_; return "${var_run_tmpdir}/$vmid.pid"; } @@ -94,7 +99,7 @@ sub vnc_socket { return "${var_run_tmpdir}/$vmid.vnc"; } -# Parse the cmdline of a running kvm/qemu process and return arguments as hash +# Parse the cmdline of a running kvm/qemu-* process and return arguments as hash sub parse_cmdline { my ($pid) = @_; @@ -106,7 +111,7 @@ sub parse_cmdline { my @param = split(/\0/, $line); my $cmd = $param[0]; - return if !$cmd || ($cmd !~ m|kvm$| && $cmd !~ m@(?:^|/)qemu-system-[^/]+$@); + return if !$cmd || ($cmd !~ m|kvm$| && $cmd !~ m@(?:^|/)qemu-[^/]+$@); my $phash = {}; my $pending_cmd; @@ -130,10 +135,8 @@ sub parse_cmdline { return; } -sub vm_running_locally { - my ($vmid) = @_; - - my $pidfile = pidfile_name($vmid); +my sub instance_running_locally { + my ($pidfile) = @_; if (my $fd = IO::File->new("<$pidfile")) { my $st = stat($fd); @@ -164,6 +167,22 @@ sub vm_running_locally { return; } +sub qsd_running_locally { + my ($id) = @_; + + my $pidfile = qsd_pidfile_name($id); + + return instance_running_locally($pidfile); +} + +sub vm_running_locally { + my ($vmid) = @_; + + my $pidfile = vm_pidfile_name($vmid); + + return instance_running_locally($pidfile); +} + sub min_version { my ($verstr, $major, $minor, $pve) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
