diff --git a/src/runtime/virtcontainers/qemu_amd64.go b/src/runtime/virtcontainers/qemu_amd64.go index e6bc54b04..9cc0f600e 100644 --- a/src/runtime/virtcontainers/qemu_amd64.go +++ b/src/runtime/virtcontainers/qemu_amd64.go @@ -167,19 +167,6 @@ func (q *qemuAmd64) bridges(number uint32) { q.Bridges = genericBridges(number, q.qemuMachine.Type) } -func (q *qemuAmd64) cpuModel() string { - cpuModel := defaultCPUModel - - // VMX is not migratable yet. - // issue: https://github.com/kata-containers/runtime/issues/1750 - if q.vmFactory { - hvLogger.WithField("subsystem", "qemuAmd64").Warn("VMX is not migratable yet: turning it off") - cpuModel += ",vmx=off" - } - - return cpuModel -} - func (q *qemuAmd64) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory { return genericMemoryTopology(memoryMb, hostMemoryMb, slots, q.memoryOffset) } diff --git a/src/runtime/virtcontainers/qemu_amd64_test.go b/src/runtime/virtcontainers/qemu_amd64_test.go index e8cf9fcd5..740cb6460 100644 --- a/src/runtime/virtcontainers/qemu_amd64_test.go +++ b/src/runtime/virtcontainers/qemu_amd64_test.go @@ -87,7 +87,7 @@ func TestQemuAmd64CPUModel(t *testing.T) { base, ok := amd64.(*qemuAmd64) assert.True(ok) base.vmFactory = true - expectedOut = defaultCPUModel + ",vmx=off" + expectedOut = defaultCPUModel model = amd64.cpuModel() assert.Equal(expectedOut, model) } diff --git a/src/runtime/virtcontainers/qemu_ppc64le.go b/src/runtime/virtcontainers/qemu_ppc64le.go index 27bac3581..6e62551b6 100644 --- a/src/runtime/virtcontainers/qemu_ppc64le.go +++ b/src/runtime/virtcontainers/qemu_ppc64le.go @@ -114,10 +114,6 @@ func (q *qemuPPC64le) bridges(number uint32) { q.Bridges = genericBridges(number, q.qemuMachine.Type) } -func (q *qemuPPC64le) cpuModel() string { - return defaultCPUModel -} - func (q *qemuPPC64le) memoryTopology(memoryMb, hostMemoryMb uint64, slots uint8) govmmQemu.Memory { q.Logger().Debug("Aligning maxmem to multiples of 256MB. Assumption: Kernel Version >= 4.11")