Signed-off-by: Fiona Ebner <[email protected]>
---
src/PVE/QemuServer.pm | 2 +-
src/PVE/QemuServer/VolumeChain.pm | 25 ++++++++++++-------------
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index a27a27c2..ddeb394c 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4427,7 +4427,7 @@ sub qemu_volume_snapshot_delete {
PVE::QemuServer::VolumeChain::blockdev_replace(
$storecfg,
- $vmid,
+ vm_qmp_peer($vmid),
$machine_version,
$attached_deviceid,
$drive,
diff --git a/src/PVE/QemuServer/VolumeChain.pm
b/src/PVE/QemuServer/VolumeChain.pm
index 1b8d199e..01c5dd9b 100644
--- a/src/PVE/QemuServer/VolumeChain.pm
+++ b/src/PVE/QemuServer/VolumeChain.pm
@@ -11,7 +11,7 @@ use PVE::Storage;
use PVE::QemuServer::Blockdev qw(generate_file_blockdev
generate_format_blockdev);
use PVE::QemuServer::BlockJob;
use PVE::QemuServer::Drive;
-use PVE::QemuServer::Monitor qw(mon_cmd vm_qmp_peer);
+use PVE::QemuServer::Monitor qw(mon_cmd qmp_cmd vm_qmp_peer);
sub blockdev_external_snapshot {
my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $snap,
$parent_snap) = @_;
@@ -26,7 +26,7 @@ sub blockdev_external_snapshot {
#reopen current to snap
blockdev_replace(
$storecfg,
- $vmid,
+ vm_qmp_peer($vmid),
$machine_version,
$deviceid,
$drive,
@@ -95,7 +95,7 @@ my sub blockdev_relative_backing_file {
sub blockdev_replace {
my (
$storecfg,
- $vmid,
+ $qmp_peer,
$machine_version,
$deviceid,
$drive,
@@ -113,9 +113,8 @@ 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 =
PVE::QemuServer::Blockdev::get_node_name_below_throttle(
- vm_qmp_peer($vmid), $deviceid, 1,
- );
+ $src_blockdev_name =
+ PVE::QemuServer::Blockdev::get_node_name_below_throttle($qmp_peer,
$deviceid, 1);
} else {
$src_name_options = { 'snapshot-name' => $src_snap };
$src_blockdev_name =
@@ -148,16 +147,16 @@ sub blockdev_replace {
);
$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 =
PVE::QemuServer::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(
@@ -173,14 +172,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,
@@ -188,7 +187,7 @@ sub blockdev_replace {
}
# delete old file|fmt nodes
- eval { PVE::QemuServer::Blockdev::detach(vm_qmp_peer($vmid),
$src_blockdev_name); };
+ eval { PVE::QemuServer::Blockdev::detach($qmp_peer, $src_blockdev_name); };
warn "detaching block node for $src_snap failed - $@" if $@;
}
--
2.47.3
