[pve-devel] [PATCH qemu-server 15/18] blockdev: switch blockdev_stream() to use QMP peer

[Fiona Ebner <f.ebner@proxmox.com>]

Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
---
 src/PVE/QemuServer.pm          |  2 +-
 src/PVE/QemuServer/Blockdev.pm | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 80bbb059..76f585fb 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4472,7 +4472,7 @@ sub qemu_volume_snapshot_delete {
             print "stream intermediate snapshot $snap to $childsnap\n";
             PVE::QemuServer::Blockdev::blockdev_stream(
                 $storecfg,
-                $vmid,
+                vm_qmp_peer($vmid),
                 $machine_version,
                 $attached_deviceid,
                 $drive,
diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm
index 7e43fbc9..569b8fd3 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -1116,8 +1116,16 @@ sub blockdev_commit {
 }
 
 sub blockdev_stream {
-    my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap, $target_snap) =
-        @_;
+    my (
+        $storecfg,
+        $qmp_peer,
+        $machine_version,
+        $deviceid,
+        $drive,
+        $snap,
+        $parent_snap,
+        $target_snap,
+    ) = @_;
 
     my $volid = $drive->{file};
     $target_snap = undef if $target_snap eq 'current';
@@ -1165,12 +1173,12 @@ sub blockdev_stream {
     $options->{'base-node'} = $parent_fmt_blockdev->{'node-name'};
     $options->{'backing-file'} = $backing_file;
 
-    mon_cmd($vmid, 'block-stream', %$options);
+    qmp_cmd($qmp_peer, 'block-stream', %$options);
     $jobs->{$job_id} = {};
 
     eval {
         PVE::QemuServer::BlockJob::qemu_drive_mirror_monitor(
-            vm_qmp_peer($vmid), undef, $jobs, 'auto', 0, 'stream',
+            $qmp_peer, undef, $jobs, 'auto', 0, 'stream',
         );
     };
     if ($@) {
@@ -1178,12 +1186,7 @@ sub blockdev_stream {
     }
 
     blockdev_delete(
-        $storecfg,
-        vm_qmp_peer($vmid),
-        $drive,
-        $snap_file_blockdev,
-        $snap_fmt_blockdev,
-        $snap,
+        $storecfg, $qmp_peer, $drive, $snap_file_blockdev, $snap_fmt_blockdev, $snap,
     );
 }
 
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel