Signed-off-by: Fiona Ebner <[email protected]>
---
src/PVE/QemuServer.pm | 2 +-
src/PVE/QemuServer/Blockdev.pm | 17 ++++++-----------
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm
index 76f585fb..d021dac6 100644
--- a/src/PVE/QemuServer.pm
+++ b/src/PVE/QemuServer.pm
@@ -4447,7 +4447,7 @@ sub qemu_volume_snapshot_delete {
print "delete first snapshot $snap\n";
PVE::QemuServer::Blockdev::blockdev_commit(
$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 569b8fd3..6566e9ac 100644
--- a/src/PVE/QemuServer/Blockdev.pm
+++ b/src/PVE/QemuServer/Blockdev.pm
@@ -1027,7 +1027,7 @@ sub blockdev_replace {
}
sub blockdev_commit {
- my ($storecfg, $vmid, $machine_version, $deviceid, $drive, $src_snap,
$target_snap) = @_;
+ my ($storecfg, $qmp_peer, $machine_version, $deviceid, $drive, $src_snap,
$target_snap) = @_;
my $volid = $drive->{file};
my $target_was_read_only;
@@ -1064,7 +1064,7 @@ sub blockdev_commit {
print "reopening internal read-only block node for '$target_snap' as
writable\n";
$target_fmt_blockdev->{'read-only'} = JSON::false;
$target_file_blockdev->{'read-only'} = JSON::false;
- mon_cmd($vmid, 'blockdev-reopen', options => [$target_fmt_blockdev]);
+ qmp_cmd($qmp_peer, 'blockdev-reopen', options =>
[$target_fmt_blockdev]);
# For the guest, the drive is still read-only, because the top
throttle node is.
}
@@ -1076,7 +1076,7 @@ sub blockdev_commit {
$opts->{'base-node'} = $target_fmt_blockdev->{'node-name'};
$opts->{'top-node'} = $src_fmt_blockdev->{'node-name'};
- mon_cmd($vmid, "block-commit", %$opts);
+ qmp_cmd($qmp_peer, "block-commit", %$opts);
$jobs->{$job_id} = {};
# if we commit the current, the blockjob need to be in 'complete' mode
@@ -1084,7 +1084,7 @@ sub blockdev_commit {
eval {
PVE::QemuServer::BlockJob::qemu_drive_mirror_monitor(
- vm_qmp_peer($vmid), undef, $jobs, $complete, 0, 'commit',
+ $qmp_peer, undef, $jobs, $complete, 0, 'commit',
);
};
if ($@) {
@@ -1092,12 +1092,7 @@ sub blockdev_commit {
}
blockdev_delete(
- $storecfg,
- vm_qmp_peer($vmid),
- $drive,
- $src_file_blockdev,
- $src_fmt_blockdev,
- $src_snap,
+ $storecfg, $qmp_peer, $drive, $src_file_blockdev,
$src_fmt_blockdev, $src_snap,
);
};
my $err = $@;
@@ -1108,7 +1103,7 @@ sub blockdev_commit {
print "re-applying read-only flag for internal block node for
'$target_snap'\n";
$target_fmt_blockdev->{'read-only'} = JSON::true;
$target_file_blockdev->{'read-only'} = JSON::true;
- eval { mon_cmd($vmid, 'blockdev-reopen', options =>
[$target_fmt_blockdev]); };
+ eval { qmp_cmd($qmp_peer, 'blockdev-reopen', options =>
[$target_fmt_blockdev]); };
print "failed to re-apply read-only flag - $@\n" if $@;
}
--
2.47.3
_______________________________________________
pve-devel mailing list
[email protected]
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
