qemu: Set govmmQemu NoReboot config Knob

merwick · merwick · commit a162469cb6c8 · 2020-07-30T09:05:44.000+01:00
The Kata architecture does not support rebooting VMs (the lifecycle being start/exec/kill) and if a VM is killed (e.g. using sysrq-trigger), the VM does not exit fully and other layers do not notice the state change. Set the NoReboot config Knob so that govmmQemu.LaunchQemu() runs QEMU with the --no-reboot command-line option. Fixes: #2866 Signed-off-by: Liam Merwick <liam.merwick@oracle.com>
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
@@ -202,6 +202,7 @@ func TestQemuKnobs(t *testing.T) {
 	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) {

Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ func TestQemuKnobs(t *testing.T) {`
`202`	`202`	`assert.Equal(q.qemuConfig.Knobs.NoUserConfig, true)`
`203`	`203`	`assert.Equal(q.qemuConfig.Knobs.NoDefaults, true)`
`204`	`204`	`assert.Equal(q.qemuConfig.Knobs.NoGraphic, true)`
	`205`	`+ assert.Equal(q.qemuConfig.Knobs.NoReboot, true)`
`205`	`206`	`}`
`206`	`207`
`207`	`208`	`func testQemuAddDevice(t *testing.T, devInfo interface{}, devType deviceType, expected []govmmQemu.Device) {`