Commit f81d86b
committed
CP-18860 check memory range before VM.start when using nested virt
When using nested_virtualisation, the VM cannot use a dynamic memory
range. We can detect this only before the VM starts and not when the
memory is set because there many path can lead to this situation:
(1) set memory range (ok), set nested_virt - now illegal
(2) set nested_virt (ok), set memory range - now illegal
Hence, we accept that nested virt and memory range can be in an
inconsistent state temporarily but check before the VM is started.
Signed-off-by: Christian Lindig <christian.lindig@citrix.com>
CP-18860 use xapi_vm_memory_constraints
This commits changes the implementation to use the
xapi_vm_memory_constraints module to check memory constraints when a VM
uses nested_virt. Previously a new error message and custom check was
used.
Signed-off-by: Christian Lindig <christian.lindig@citrix.com>1 parent 3163abc commit f81d86b
File tree
4 files changed
+21
-18
lines changed- ocaml
- idl
- xapi
4 files changed
+21
-18
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
511 | 511 | | |
512 | 512 | | |
513 | 513 | | |
| 514 | + | |
| 515 | + | |
514 | 516 | | |
515 | 517 | | |
516 | 518 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
371 | 371 | | |
372 | 372 | | |
373 | 373 | | |
374 | | - | |
375 | | - | |
376 | | - | |
377 | | - | |
378 | | - | |
379 | | - | |
380 | | - | |
381 | | - | |
382 | | - | |
383 | | - | |
384 | | - | |
385 | | - | |
386 | 374 | | |
387 | 375 | | |
388 | 376 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
51 | 51 | | |
52 | 52 | | |
53 | 53 | | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
54 | 61 | | |
55 | 62 | | |
56 | 63 | | |
57 | | - | |
58 | | - | |
59 | | - | |
| 64 | + | |
60 | 65 | | |
61 | 66 | | |
62 | 67 | | |
63 | 68 | | |
64 | | - | |
65 | | - | |
66 | | - | |
| 69 | + | |
67 | 70 | | |
68 | 71 | | |
69 | 72 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
708 | 708 | | |
709 | 709 | | |
710 | 710 | | |
| 711 | + | |
| 712 | + | |
| 713 | + | |
| 714 | + | |
| 715 | + | |
| 716 | + | |
| 717 | + | |
| 718 | + | |
| 719 | + | |
| 720 | + | |
711 | 721 | | |
712 | 722 | | |
713 | 723 | | |
| |||
0 commit comments