github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-04-30 04:34:27 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Remove pmu limitation in nested virtualization of amd/ppc64le

Browse Source 
[ port from runtime commit 18662e16687453185ff4cf99b495a34e3ea9935f ]

It's up to the user enable/disable pmu. After previous commit, the default
pmu option has been set to off.

This patch removes the hard limitation and unit test codes.

Signed-off-by: Jia He <justin.he@arm.com>
Signed-off-by: Peng Tao <bergwolf@hyper.sh>
This commit is contained in:
Jia He 2020-06-29 20:33:46 -07:00 committed by Peng Tao
parent 06571f0377
commit 3a17e7aafe
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/runtime/virtcontainers/qemu_amd64.go
View File

@ -158,9 +158,6 @@ func (q *qemuAmd64) bridges(number uint32) {
func (q *qemuAmd64) cpuModel() string { func (q *qemuAmd64) cpuModel() string {
cpuModel := defaultCPUModel cpuModel := defaultCPUModel
if q.nestedRun {
cpuModel += ",pmu=off"
}
// VMX is not migratable yet. // VMX is not migratable yet.
// issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/1750 // issue: https://github.com/kata-containers/kata-containers/src/runtime/issues/1750

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

@ -95,11 +95,6 @@ func TestQemuAmd64CPUModel(t *testing.T) {
model := amd64.cpuModel() model := amd64.cpuModel()
assert.Equal(expectedOut, model) assert.Equal(expectedOut, model)
amd64.enableNestingChecks()
expectedOut = defaultCPUModel + ",pmu=off"
model = amd64.cpuModel()
assert.Equal(expectedOut, model)
amd64.disableNestingChecks() amd64.disableNestingChecks()
base, ok := amd64.(*qemuAmd64) base, ok := amd64.(*qemuAmd64)
assert.True(ok) assert.True(ok)