[pve-devel] [PATCH v5 qemu-server 2/10] qemuserver: foreach_volid: always include pending disks
Aaron Lauterer
a.lauterer at proxmox.com
Mon Jun 19 11:29:29 CEST 2023
All calling sites except for QemuConfig.pm::get_replicatable_volumes()
already enabled it. Making it the non-configurable default results in a
change in the VM replication. Now a disk image only referenced in the
pending section will also be replicated.
Signed-off-by: Aaron Lauterer <a.lauterer at proxmox.com>
---
changes since v4:
- changed call in foreach_volid to a post-if as we only check for 2
conditions now. It should still be quite readable this way
PVE/API2/Qemu.pm | 2 +-
PVE/QemuConfig.pm | 2 +-
PVE/QemuMigrate.pm | 2 +-
PVE/QemuServer.pm | 9 ++++-----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index 37f78fe..c92734a 100644
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4164,7 +4164,7 @@ my $check_vm_disks_local = sub {
my $local_disks = {};
# add some more information to the disks e.g. cdrom
- PVE::QemuServer::foreach_volid($vmconf, 1, sub {
+ PVE::QemuServer::foreach_volid($vmconf, sub {
my ($volid, $attr) = @_;
my ($storeid, $volname) = PVE::Storage::parse_volume_id($volid, 1);
diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm
index 5e46db2..10e6929 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -161,7 +161,7 @@ sub get_replicatable_volumes {
$volhash->{$volid} = 1;
};
- PVE::QemuServer::foreach_volid($conf, undef, $test_volid);
+ PVE::QemuServer::foreach_volid($conf, $test_volid);
return $volhash;
}
diff --git a/PVE/QemuMigrate.pm b/PVE/QemuMigrate.pm
index 3b3ef2a..b10a515 100644
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -451,7 +451,7 @@ sub scan_local_volumes {
if PVE::Storage::volume_is_base_and_used($storecfg, $volid);
};
- PVE::QemuServer::foreach_volid($conf, 1, sub {
+ PVE::QemuServer::foreach_volid($conf, sub {
my ($volid, $attr) = @_;
eval { $test_volid->($volid, $attr); };
if (my $err = $@) {
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 8e6658e..7666dcb 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4855,7 +4855,7 @@ sub set_migration_caps {
}
sub foreach_volid {
- my ($conf, $include_pending, $func, @param) = @_;
+ my ($conf, $func, @param) = @_;
my $volhash = {};
@@ -4905,9 +4905,8 @@ sub foreach_volid {
PVE::QemuConfig->foreach_volume_full($conf, $include_opts, $test_volid);
- if ($include_pending && defined($conf->{pending}) && $conf->{pending}->%*) {
- PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1);
- }
+ PVE::QemuConfig->foreach_volume_full($conf->{pending}, $include_opts, $test_volid, undef, 1)
+ if defined($conf->{pending}) && $conf->{pending}->%*;
foreach my $snapname (keys %{$conf->{snapshots}}) {
my $snap = $conf->{snapshots}->{$snapname};
@@ -6156,7 +6155,7 @@ sub get_vm_volumes {
my ($conf) = @_;
my $vollist = [];
- foreach_volid($conf, 1, sub {
+ foreach_volid($conf, sub {
my ($volid, $attr) = @_;
return if $volid =~ m|^/|;
--
2.39.2
More information about the pve-devel
mailing list