@@ -489,6 +489,21 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
489
489
}
490
490
}
491
491
492
+ // MountType has to be resolved before resolving Mounts
493
+ if y .MountType == nil {
494
+ y .MountType = d .MountType
495
+ }
496
+ if o .MountType != nil {
497
+ y .MountType = o .MountType
498
+ }
499
+ if y .MountType == nil || * y .MountType == "" {
500
+ if * y .VMType == VZ {
501
+ y .MountType = pointer .String (VIRTIOFS )
502
+ } else {
503
+ y .MountType = pointer .String (REVSSHFS )
504
+ }
505
+ }
506
+
492
507
// Combine all mounts; highest priority entry determines writable status.
493
508
// Only works for exact matches; does not normalize case or resolve symlinks.
494
509
mounts := make ([]Mount , 0 , len (d .Mounts )+ len (y .Mounts )+ len (o .Mounts ))
@@ -552,7 +567,7 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
552
567
if mount .NineP .Msize == nil {
553
568
mounts [i ].NineP .Msize = pointer .String (Default9pMsize )
554
569
}
555
- if mount .Virtiofs .QueueSize == nil {
570
+ if mount .Virtiofs .QueueSize == nil && * y . VMType == QEMU && * y . MountType == VIRTIOFS {
556
571
mounts [i ].Virtiofs .QueueSize = pointer .Int (DefaultVirtiofsQueueSize )
557
572
}
558
573
if mount .Writable == nil {
@@ -570,20 +585,6 @@ func FillDefault(y, d, o *LimaYAML, filePath string) {
570
585
}
571
586
}
572
587
573
- if y .MountType == nil {
574
- y .MountType = d .MountType
575
- }
576
- if o .MountType != nil {
577
- y .MountType = o .MountType
578
- }
579
- if y .MountType == nil || * y .MountType == "" {
580
- if * y .VMType == VZ {
581
- y .MountType = pointer .String (VIRTIOFS )
582
- } else {
583
- y .MountType = pointer .String (REVSSHFS )
584
- }
585
- }
586
-
587
588
// Note: DNS lists are not combined; highest priority setting is picked
588
589
if len (y .DNS ) == 0 {
589
590
y .DNS = d .DNS
0 commit comments