github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 05:19:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #474 from merwick/2.0-dev

Browse Source 
Kata 2.0-dev port of #2867 (NoReboot Knob)
This commit is contained in:
Fabiano Fidêncio
2020-07-30 22:10:46 +02:00
committed by GitHub
parent b94b46db08 c15ef219e5
commit ec84a94a61
6 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/runtime/virtcontainers/qemu.go
View File

@@ -481,6 +481,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,

18
src/runtime/virtcontainers/qemu_test.go
View File

@@ -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)
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{