Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
Signed-off-by: yaroslavborbat <[email protected]>
  • Loading branch information
yaroslavborbat committed Jan 18, 2025
1 parent 9c604cf commit f72b53f
Showing 1 changed file with 23 additions and 0 deletions.
23 changes: 23 additions & 0 deletions images/virt-artifact/patches/032-hotplug-container-disk.patch
Original file line number Diff line number Diff line change
Expand Up @@ -1792,6 +1792,29 @@ index d8b777e5fb..f580d06e52 100644
}
}

diff --git a/pkg/virt-launcher/virtwrap/manager.go b/pkg/virt-launcher/virtwrap/manager.go
index 4a1d22de46..cddee4f199 100644
--- a/pkg/virt-launcher/virtwrap/manager.go
+++ b/pkg/virt-launcher/virtwrap/manager.go
@@ -32,6 +32,7 @@ import (
"errors"
"fmt"
"io"
+ "maps"
"os"
"os/exec"
"path/filepath"
@@ -1029,9 +1030,7 @@ func (l *LibvirtDomainManager) generateConverterContext(vmi *v1.VirtualMachineIn
// Add preallocated and thick-provisioned volumes for which we need to avoid the discard=unmap option
c.VolumesDiscardIgnore = options.PreallocatedVolumes

- if len(options.DisksInfo) > 0 {
- l.disksInfo = options.DisksInfo
- }
+ maps.Copy(l.disksInfo, options.DisksInfo)

if options.GetClusterConfig() != nil {
c.ExpandDisksEnabled = options.GetClusterConfig().GetExpandDisksEnabled()
diff --git a/pkg/virt-operator/resource/apply/BUILD.bazel b/pkg/virt-operator/resource/apply/BUILD.bazel
index f6bd9bd4f1..fe6ab54f8c 100644
--- a/pkg/virt-operator/resource/apply/BUILD.bazel
Expand Down

0 comments on commit f72b53f

Please sign in to comment.