qemuserver: foreach_volid: always include pending disks

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@proxmox.com>

diff --git a/PVE/API2/Qemu.pm b/PVE/API2/Qemu.pm
index c75d95502960101796e93ec46c873bc08412f598..593071331b82880fbb1bace2c2c37dae6c395ad9 100644 (file)
--- a/PVE/API2/Qemu.pm
+++ b/PVE/API2/Qemu.pm
@@ -4232,7 +4232,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 5e46db211da94f510edd467de53a7ef11a4fcd4d..10e692998e9cdb089273f77a0ce69b262e179c5c 100644 (file)
--- 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 4058a56e686b5f344e3d7df32da1b6adf26119be..600eeb7f74acd5fafae8feb45a53b1bad9546b6a 100644 (file)
--- a/PVE/QemuMigrate.pm
+++ b/PVE/QemuMigrate.pm
@@ -468,7 +468,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 e1a048c88f266101674a566e1c66cf9faeeb9c2b..a573f0623e37e97a1f358acd7cbd3c98b657de9b 100644 (file)
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -4840,7 +4840,7 @@ sub set_migration_caps {
 }
 
 sub foreach_volid {
-    my ($conf, $include_pending, $func, @param) = @_;
+    my ($conf, $func, @param) = @_;
 
     my $volhash = {};
 
@@ -4890,9 +4890,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};
@@ -6148,7 +6147,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|^/|;