Merge pull request #2867 from merwick/master

qemu: Set govmmQemu NoReboot Knob
kata-containers · Jul 30, 2020 · 31fcfa6 · 31fcfa6
2 parents 34a6962 + a162469
commit 31fcfa6
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -48,7 +48,7 @@
 
 [[constraint]]
   name = "github.com/intel/govmm"
-  revision = "af9e34b91ae99aff4b4ac126141259d34d98e9f2"
+  revision = "6c3315ba8a4262df4300b735b2c53ce3b15d21dd"
 
 [[constraint]]
   name = "github.com/kata-containers/agent"

diff --git a/vendor/github.com/intel/govmm/qemu/qemu.go b/vendor/github.com/intel/govmm/qemu/qemu.go
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -489,6 +489,7 @@ func (q *qemu) createSandbox(ctx context.Context, id string, networkNS NetworkNa
 		NoUserConfig: true,
 		NoDefaults:   true,
 		NoGraphic:    true,
+		NoReboot:     true,
 		Daemonize:    true,
 		MemPrealloc:  q.config.MemPrealloc,
 		HugePages:    q.config.HugePages,

diff --git a/virtcontainers/qemu_test.go b/virtcontainers/qemu_test.go
@@ -187,6 +187,24 @@ func TestQemuMemoryTopology(t *testing.T) {
 	assert.Exactly(memory, expectedOut)
 }
 
+func TestQemuKnobs(t *testing.T) {
+	assert := assert.New(t)
+
+	sandbox, err := createQemuSandboxConfig()
+	assert.NoError(err)
+
+	q := &qemu{
+		store: sandbox.newStore,
+	}
+	err = q.createSandbox(context.Background(), sandbox.id, NetworkNamespace{}, &sandbox.config.HypervisorConfig, false)
+	assert.NoError(err)
+
+	assert.Equal(q.qemuConfig.Knobs.NoUserConfig, true)
+	assert.Equal(q.qemuConfig.Knobs.NoDefaults, true)
+	assert.Equal(q.qemuConfig.Knobs.NoGraphic, true)
+	assert.Equal(q.qemuConfig.Knobs.NoReboot, true)
+}
+
 func testQemuAddDevice(t *testing.T, devInfo interface{}, devType deviceType, expected []govmmQemu.Device) {
 	assert := assert.New(t)
 	q := &qemu{