[pve-devel] [PATCH v2 qemu-server 09/11] extract register_qmeventd_handle to QemuServer.pm

[Stefan Reiter]

...to be reused by live-restore.

Signed-off-by: Stefan Reiter <s.reiter at proxmox.com>
---

v2:
* unchanged

 PVE/QemuServer.pm        | 28 ++++++++++++++++++++++++++++
 PVE/VZDump/QemuServer.pm | 32 ++------------------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index d4ee8ec..e420de3 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -7470,6 +7470,34 @@ sub device_bootorder {
     return $bootorder;
 }
 
+sub register_qmeventd_handle {
+    my ($vmid) = @_;
+
+    my $fh;
+    my $peer = "/var/run/qmeventd.sock";
+    my $count = 0;
+
+    for (;;) {
+	$count++;
+	$fh = IO::Socket::UNIX->new(Peer => $peer, Blocking => 0, Timeout => 1);
+	last if $fh;
+	if ($! != EINTR && $! != EAGAIN) {
+	    die "unable to connect to qmeventd socket (vmid: $vmid) - $!\n";
+	}
+	if ($count > 4) {
+	    die "unable to connect to qmeventd socket (vmid: $vmid) - timeout "
+	      . "after $count retries\n";
+	}
+	usleep(25000);
+    }
+
+    # send handshake to mark VM as backing up
+    print $fh to_json({vzdump => {vmid => "$vmid"}});
+
+    # return handle to be closed later when inhibit is no longer required
+    return $fh;
+}
+
 # bash completion helper
 
 sub complete_backup_archives {
diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm
index 901b366..aaff712 100644
--- a/PVE/VZDump/QemuServer.pm
+++ b/PVE/VZDump/QemuServer.pm
@@ -481,7 +481,7 @@ sub archive_pbs {
     my $devlist = _get_task_devlist($task);
 
     $self->enforce_vm_running_for_backup($vmid);
-    $self->register_qmeventd_handle($vmid);
+    $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid);
 
     my $backup_job_uuid;
     eval {
@@ -650,7 +650,7 @@ sub archive_vma {
     my $devlist = _get_task_devlist($task);
 
     $self->enforce_vm_running_for_backup($vmid);
-    $self->register_qmeventd_handle($vmid);
+    $self->{qmeventd_fh} = PVE::QemuServer::register_qmeventd_handle($vmid);
 
     my $cpid;
     my $backup_job_uuid;
@@ -809,34 +809,6 @@ sub enforce_vm_running_for_backup {
     die $@ if $@;
 }
 
-sub register_qmeventd_handle {
-    my ($self, $vmid) = @_;
-
-    my $fh;
-    my $peer = "/var/run/qmeventd.sock";
-    my $count = 0;
-
-    for (;;) {
-	$count++;
-	$fh = IO::Socket::UNIX->new(Peer => $peer, Blocking => 0, Timeout => 1);
-	last if $fh;
-	if ($! != EINTR && $! != EAGAIN) {
-	    $self->log("warn", "unable to connect to qmeventd socket (vmid: $vmid) - $!\n");
-	    return;
-	}
-	if ($count > 4) {
-	    $self->log("warn", "unable to connect to qmeventd socket (vmid: $vmid)"
-			     . " - timeout after $count retries\n");
-	    return;
-	}
-	usleep(25000);
-    }
-
-    # send handshake to mark VM as backing up
-    print $fh to_json({vzdump => {vmid => "$vmid"}});
-    $self->{qmeventd_fh} = $fh;
-}
-
 # resume VM againe once we got in a clear state (stop mode backup of running VM)
 sub resume_vm_after_job_start {
     my ($self, $task, $vmid) = @_;
-- 
2.20.1