Merge pull request #321 from dgibson/ppc64le

Don't use some x86 specific kernel and qemu options

src/runtime/virtcontainers/qemu_ppc64le.go

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

src/runtime/virtcontainers/qemu_ppc64le_test.go

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