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

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

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

diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 638bc215..6f2ee75c 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4382,7 +4382,13 @@ sub qemu_volume_snapshot {
         my $snapshots = PVE::Storage::volume_snapshot_info($storecfg, $volid);
         my $parent_snap = $snapshots->{'current'}->{parent};
         PVE::QemuServer::Blockdev::blockdev_external_snapshot(
-            $storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap,
+            $storecfg,
+            vm_qmp_peer($vmid),
+            $machine_version,
+            $deviceid,
+            $drive,
+            $snap,
+            $parent_snap,
         );
     } elsif ($do_snapshots_type eq 'storage') {
         PVE::Storage::volume_snapshot($storecfg, $volid, $snap);
diff --git a/src/PVE/QemuServer/Blockdev.pm b/src/PVE/QemuServer/Blockdev.pm
index 614d71f4..8db17683 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -856,7 +856,7 @@ sub set_io_throttle {
 }
 
 sub blockdev_external_snapshot {
-    my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $snap, $parent_snap) = @_;
+    my ($storecfg, $qmp_peer, $machine_version, $deviceid, $drive, $snap, $parent_snap) = @_;
 
     print "Creating a new current volume with $snap as backing snap\n";
 
@@ -868,7 +868,7 @@ sub blockdev_external_snapshot {
     #reopen current to snap
     blockdev_replace(
         $storecfg,
-        vm_qmp_peer($vmid),
+        $qmp_peer,
         $machine_version,
         $deviceid,
         $drive,
@@ -895,11 +895,11 @@ sub blockdev_external_snapshot {
     #backing need to be forced to undef in blockdev, to avoid reopen of backing-file on blockdev-add
     $new_fmt_blockdev->{backing} = undef;
 
-    mon_cmd($vmid, 'blockdev-add', %$new_fmt_blockdev);
+    qmp_cmd($qmp_peer, 'blockdev-add', %$new_fmt_blockdev);
 
     print "blockdev-snapshot: reopen current with $snap backing image\n";
-    mon_cmd(
-        $vmid, 'blockdev-snapshot',
+    qmp_cmd(
+        $qmp_peer, 'blockdev-snapshot',
         node => $snap_fmt_blockdev->{'node-name'},
         overlay => $new_fmt_blockdev->{'node-name'},
     );
-- 
2.47.3



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