diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-09-18 15:27:30 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-18 15:27:30 +0100 |
| commit | 3fec74185970d4ad3b176e3126ffcdd5ab07b11d (patch) | |
| tree | 7dea5d7c3e571e53460395aad5d95205df455f8b /interface-definitions | |
| parent | b4d6e2cc841b1f88c1545ea288be0437ac4edd2e (diff) | |
| parent | 45f7f3849a15af888cb826b4d71046553911eebd (diff) | |
| download | vyos-1x-3fec74185970d4ad3b176e3126ffcdd5ab07b11d.tar.gz vyos-1x-3fec74185970d4ad3b176e3126ffcdd5ab07b11d.zip | |
Merge pull request #4729 from natali-rs1985/T7805
T7805: VPP remove unused 'default-hugepage-size' from memory section and restrict page sizes in xml
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/unformat_log2_page_size.xml.i | 17 | ||||
| -rw-r--r-- | interface-definitions/vpp.xml.in | 11 |
2 files changed, 11 insertions, 17 deletions
diff --git a/interface-definitions/include/unformat_log2_page_size.xml.i b/interface-definitions/include/unformat_log2_page_size.xml.i index ce6f70dc8..7678c1860 100644 --- a/interface-definitions/include/unformat_log2_page_size.xml.i +++ b/interface-definitions/include/unformat_log2_page_size.xml.i @@ -1,17 +1,20 @@ <!-- include start from unformat_log2_page_size.xml.i --> <completionHelp> - <list>default default-hugepage</list> - <script>sudo ${vyos_completion_dir}/list_mem_page_size.py</script> + <list>4K 2M 1G</list> </completionHelp> <valueHelp> - <format>default</format> - <description>Default</description> + <format>4K</format> + <description>4 kilobytes</description> </valueHelp> <valueHelp> - <format>default-hugepage</format> - <description>Default huge-page</description> + <format>2M</format> + <description>2 megabytes</description> +</valueHelp> +<valueHelp> + <format>1G</format> + <description>1 gigabyte</description> </valueHelp> <constraint> - <regex>(default|default-hugepage|4K|8K|1024K|64K|256K|2048K|4096K|16384K|262144K|1048576K|16777216K|1M|2M|4M|16M|256M|1024M|16384M|1G|16G)</regex> + <regex>(4K|2M|1G)</regex> </constraint> <!-- include end --> diff --git a/interface-definitions/vpp.xml.in b/interface-definitions/vpp.xml.in index e7a21ecf1..1eb41259d 100644 --- a/interface-definitions/vpp.xml.in +++ b/interface-definitions/vpp.xml.in @@ -392,7 +392,7 @@ <help>Set the page-size for buffer allocation</help> #include <include/unformat_log2_page_size.xml.i> </properties> - <defaultValue>default</defaultValue> + <defaultValue>2M</defaultValue> </leafNode> </children> </node> @@ -789,15 +789,6 @@ </properties> <defaultValue>2M</defaultValue> </leafNode> - <leafNode name="default-hugepage-size"> - <properties> - <help>Default hugepage size</help> - <completionHelp> - <script>sudo ${vyos_completion_dir}/list_mem_page_size.py --hugepage_only True </script> - </completionHelp> - </properties> - <defaultValue>2M</defaultValue> - </leafNode> </children> </node> <node name="nat44"> |