github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 18:30:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1458 from amshinde/pass-vsock-as-kernel-option

Browse Source 
vsock: Pass info about vsock being used or not to the agent.
This commit is contained in:
Eric Ernst
2019-04-02 16:18:41 -07:00
committed by GitHub
parent c9a3b933f8 57b103a81b
commit 5a41e5f240
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
virtcontainers/qemu.go
View File

@@ -94,8 +94,9 @@ const (
qmpExecCatCmd = "exec:cat" qmpExecCatCmd = "exec:cat"
qmpMigrationWaitTimeout = 5 * time.Second qmpMigrationWaitTimeout = 5 * time.Second
scsiControllerID = "scsi0" scsiControllerID = "scsi0"
rngID = "rng0" rngID = "rng0"
vsockKernelOption = "agent.use_vsock"
) )
var qemuMajorVersion int var qemuMajorVersion int
@@ -152,6 +153,11 @@ func (q *qemu) kernelParameters() string {
// set the maximum number of vCPUs // set the maximum number of vCPUs
params = append(params, Param{"nr_cpus", fmt.Sprintf("%d", q.config.DefaultMaxVCPUs)}) params = append(params, Param{"nr_cpus", fmt.Sprintf("%d", q.config.DefaultMaxVCPUs)})
// Add a kernel param to indicate if vsock is being used.
// This will be consumed by the agent to determine if it needs to listen on
// a serial or vsock channel
params = append(params, Param{vsockKernelOption, strconv.FormatBool(q.config.UseVSock)})
// add the params specified by the provided config. As the kernel // add the params specified by the provided config. As the kernel
// honours the last parameter value set and since the config-provided // honours the last parameter value set and since the config-provided
// params are added here, they will take priority over the defaults. // params are added here, they will take priority over the defaults.

2
virtcontainers/qemu_test.go
View File

@@ -56,7 +56,7 @@ func testQemuKernelParameters(t *testing.T, kernelParams []Param, expected strin
} }
func TestQemuKernelParameters(t *testing.T) { func TestQemuKernelParameters(t *testing.T) {
expectedOut := fmt.Sprintf("panic=1 nr_cpus=%d foo=foo bar=bar", MaxQemuVCPUs()) expectedOut := fmt.Sprintf("panic=1 nr_cpus=%d agent.use_vsock=false foo=foo bar=bar", MaxQemuVCPUs())
params := []Param{ params := []Param{
{ {
Key: "foo", Key: "foo",