Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mynij
slapos-mynij-dev
Commits
e0f61aeb
Commit
e0f61aeb
authored
Aug 29, 2018
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kvm: by default cpu-model is set always as host
parent
febcbfa9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
software/kvm/instance-kvm-cluster-input-schema.json
software/kvm/instance-kvm-cluster-input-schema.json
+2
-1
software/kvm/software.cfg
software/kvm/software.cfg
+1
-1
software/kvm/template/template-kvm-run.in
software/kvm/template/template-kvm-run.in
+1
-1
No files found.
software/kvm/instance-kvm-cluster-input-schema.json
View file @
e0f61aeb
...
...
@@ -288,7 +288,8 @@
"cpu-model"
:
{
"title"
:
"CPU model."
,
"description"
:
"Select the emulated CPU model. Ex: SandyBridge,+erms,+smep,+smx,+vmx"
,
"type"
:
"string"
"type"
:
"string"
,
"default"
:
"host"
},
"keyboard-layout-language"
:
{
"title"
:
"Use keyboard layout language"
,
...
...
software/kvm/software.cfg
View file @
e0f61aeb
...
...
@@ -186,7 +186,7 @@ ignore-existing = true
url = ${:_profile_base_location_}/template/template-kvm-run.in
mode = 644
filename = template-kvm-run.in
md5sum =
c6f1536a3502102dadbfb9d82496cc36
md5sum =
4123fa5d59edaeb31f0e8b5efad605c7
download-only = true
on-update = true
...
...
software/kvm/template/template-kvm-run.in
View file @
e0f61aeb
...
...
@@ -72,7 +72,7 @@ disk_aio = disk_aio if disk_aio in ["threads", "native"] and \
smp_count = {{ parameter_dict.get("smp-count") }}
smp_max_count = {{ parameter_dict.get("smp-max-count") }}
machine_options = '{{ parameter_dict.get("machine-options", "") }}'.strip()
cpu_model = '{{ parameter_dict.get("cpu-model", "") }}'.strip()
cpu_model = '{{ parameter_dict.get("cpu-model", "
host
") }}'.strip()
enable_device_hotplug = '{{ parameter_dict.get("enable-device-hotplug") }}'.lower()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment