github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 14:32:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #321 from dgibson/ppc64le

Browse Source 
Don't use some x86 specific kernel and qemu options
This commit is contained in:
Peng Tao 2020-06-24 10:28:07 +08:00 committed by GitHub
commit ec146a1b39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/runtime/virtcontainers/qemu_ppc64le.go
View File

@ -32,10 +32,7 @@ var qemuPaths = map[string]string{
} }
var kernelParams = []Param{ var kernelParams = []Param{
{"tsc", "reliable"},
{"no_timer_check", ""},
{"rcupdate.rcu_expedited", "1"}, {"rcupdate.rcu_expedited", "1"},
{"noreplace-smp", ""},
{"reboot", "k"}, {"reboot", "k"},
{"console", "hvc0"}, {"console", "hvc0"},
{"console", "hvc1"}, {"console", "hvc1"},
@ -104,11 +101,7 @@ func (q *qemuPPC64le) bridges(number uint32) {
} }
func (q *qemuPPC64le) cpuModel() string { func (q *qemuPPC64le) cpuModel() string {
cpuModel := defaultCPUModel return defaultCPUModel
if q.nestedRun {
cpuModel += ",pmu=off"
}
return cpuModel
} }
func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory { func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory {

5
src/runtime/virtcontainers/qemu_ppc64le_test.go
View File

@ -27,11 +27,6 @@ func TestQemuPPC64leCPUModel(t *testing.T) {
expectedOut := defaultCPUModel expectedOut := defaultCPUModel
model := ppc64le.cpuModel() model := ppc64le.cpuModel()
assert.Equal(expectedOut, model) assert.Equal(expectedOut, model)
ppc64le.enableNestingChecks()
expectedOut = defaultCPUModel + ",pmu=off"
model = ppc64le.cpuModel()
assert.Equal(expectedOut, model)
} }
func TestQemuPPC64leMemoryTopology(t *testing.T) { func TestQemuPPC64leMemoryTopology(t *testing.T) {