[pve-devel] [PATCH qemu-server 09/18] blockdev: switch blockdev_replace() 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 | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index e3a8d116..638bc215 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4453,7 +4453,7 @@ sub qemu_volume_snapshot_delete {
 
             PVE::QemuServer::Blockdev::blockdev_replace(
                 $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 fa252ce0..614d71f4 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -868,7 +868,7 @@ sub blockdev_external_snapshot {
     #reopen current to snap
     blockdev_replace(
         $storecfg,
-        $vmid,
+        vm_qmp_peer($vmid),
         $machine_version,
         $deviceid,
         $drive,
@@ -937,7 +937,7 @@ my sub blockdev_relative_backing_file {
 sub blockdev_replace {
     my (
         $storecfg,
-        $vmid,
+        $qmp_peer,
         $machine_version,
         $deviceid,
         $drive,
@@ -955,7 +955,7 @@ sub blockdev_replace {
     my $src_blockdev_name;
     if ($src_snap eq 'current') {
         # there might be other nodes on top like zeroinit, look up the current node below throttle
-        $src_blockdev_name = get_node_name_below_throttle(vm_qmp_peer($vmid), $deviceid, 1);
+        $src_blockdev_name = get_node_name_below_throttle($qmp_peer, $deviceid, 1);
     } else {
         $src_name_options = { 'snapshot-name' => $src_snap };
         $src_blockdev_name = get_node_name('fmt', $drive_id, $volid, $src_name_options);
@@ -983,15 +983,15 @@ sub blockdev_replace {
                 get_node_name('fmt', $drive_id, $volid, { 'snapshot-name' => $parent_snap });
             $target_fmt_blockdev->{backing} = $parent_fmt_nodename;
         }
-        mon_cmd($vmid, 'blockdev-add', %$target_fmt_blockdev);
+        qmp_cmd($qmp_peer, 'blockdev-add', %$target_fmt_blockdev);
 
         #reopen the current throttlefilter nodename with the target fmt nodename
         my $throttle_blockdev =
             generate_throttle_blockdev($drive, $target_fmt_blockdev->{'node-name'}, {});
-        mon_cmd($vmid, 'blockdev-reopen', options => [$throttle_blockdev]);
+        qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$throttle_blockdev]);
     } else {
         #intermediate snapshot
-        mon_cmd($vmid, 'blockdev-add', %$target_fmt_blockdev);
+        qmp_cmd($qmp_peer, 'blockdev-add', %$target_fmt_blockdev);
 
         #reopen the parent node with the new target fmt backing node
         my $parent_file_blockdev = generate_file_blockdev(
@@ -1007,14 +1007,14 @@ sub blockdev_replace {
             { 'snapshot-name' => $parent_snap },
         );
         $parent_fmt_blockdev->{backing} = $target_fmt_blockdev->{'node-name'};
-        mon_cmd($vmid, 'blockdev-reopen', options => [$parent_fmt_blockdev]);
+        qmp_cmd($qmp_peer, 'blockdev-reopen', options => [$parent_fmt_blockdev]);
 
         my $backing_file =
             blockdev_relative_backing_file($target_file_blockdev, $parent_file_blockdev);
 
         #change backing-file in qcow2 metadatas
-        mon_cmd(
-            $vmid, 'change-backing-file',
+        qmp_cmd(
+            $qmp_peer, 'change-backing-file',
             device => $deviceid,
             'image-node-name' => $parent_fmt_blockdev->{'node-name'},
             'backing-file' => $backing_file,
@@ -1022,7 +1022,7 @@ sub blockdev_replace {
     }
 
     # delete old file|fmt nodes
-    eval { detach(vm_qmp_peer($vmid), $src_blockdev_name); };
+    eval { detach($qmp_peer, $src_blockdev_name); };
     warn "detaching block node for $src_snap failed - $@" if $@;
 }
 
-- 
2.47.3



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