Skip to content

Commit a90d5fc

Browse files
committed
Merge remote-tracking branch 'origin/pr/360' into pr-359-merge
* origin/pr/360: Document default_dispvm preload feature
2 parents 145b219 + 2447603 commit a90d5fc

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

doc/manpages/qvm-features.rst

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -429,13 +429,15 @@ on it.
429429
preload-dispvm-max
430430
^^^^^^^^^^^^^^^^^^
431431

432-
Number of disposables to preload. Upon setting, the quantity of running
433-
preloaded disposables will be adjusted to match the maximum configured, if there
434-
is not enough of them and there is enough available memory on the system, new
435-
ones will be created, if there are more than enough, the excess will be removed.
432+
Number of disposables to preload. Upon setting, the number of running preloaded
433+
disposables will be adjusted to match the maximum configured, if there is not
434+
enough of them and there is enough available memory on the system, new ones will
435+
be created, if there are more than enough, the excess will be removed. When set
436+
on `dom0`, preloaded disposables will derive from the `default_dispvm` and its
437+
setting has precedence over the qube disposable template feature.
436438

437439
|
438-
| **Valid on**: disposable template
440+
| **Valid on**: disposable template and dom0
439441
| **Type**: `int`
440442
| **Default**: `0`
441443

0 commit comments

Comments
 (0)