github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 00:07:16 +00:00
Code Issues Projects Releases Wiki Activity

qemu: Add a SysProcAttr parameter to LaunchCustomQemu

Browse Source 
This change adds an additional parameter to LaunchCustomQemu that
allows users more control over the newly created process.  They can
for instance specify the user under which the new qemu process should
run and which capabilities should be retained in the child qemu
process.

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
This commit is contained in:
Mark Ryan 2017-10-30 09:55:07 +00:00
parent b639da45ed
commit 11977072ea
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples_test.go
View File

@ -41,7 +41,7 @@ func Example() {
// LaunchCustomQemu should return as soon as the instance has launched as we
// are using the --daemonize flag. It will set up a unix domain socket
// called /tmp/qmp-socket that we can use to manage the instance.
_, err := qemu.LaunchCustomQemu(context.Background(), "", params, nil, nil)
_, err := qemu.LaunchCustomQemu(context.Background(), "", params, nil, nil, nil)
if err != nil {
panic(err)
}

15
qemu.go
View File

@ -31,6 +31,7 @@ import (
"os/exec"
"strconv"
"strings"
"syscall"
"context"
)
@ -1296,7 +1297,8 @@ func LaunchQemu(config Config, logger QMPLog) (string, error) {
config.appendKernel()
config.appendBios()
return LaunchCustomQemu(config.Ctx, config.Path, config.qemuParams, config.fds, logger)
return LaunchCustomQemu(config.Ctx, config.Path, config.qemuParams,
config.fds, nil, logger)
}
// LaunchCustomQemu can be used to launch a new qemu instance.
@ -1307,16 +1309,19 @@ func LaunchQemu(config Config, logger QMPLog) (string, error) {
// signature of this function will not need to change when launch cancellation
// is implemented.
//
// config.qemuParams is a slice of options to pass to qemu-system-x86_64 and fds is a
// params is a slice of options to pass to qemu-system-x86_64 and fds is a
// list of open file descriptors that are to be passed to the spawned qemu
// process.
// process. The attrs parameter can be used to control aspects of the
// newly created qemu process, such as the user and group under which it
// runs. It may be nil.
//
// This function writes its log output via logger parameter.
//
// The function will block until the launched qemu process exits. "", nil
// will be returned if the launch succeeds. Otherwise a string containing
// the contents of stderr + a Go error object will be returned.
func LaunchCustomQemu(ctx context.Context, path string, params []string, fds []*os.File, logger QMPLog) (string, error) {
func LaunchCustomQemu(ctx context.Context, path string, params []string, fds []*os.File,
attr *syscall.SysProcAttr, logger QMPLog) (string, error) {
if logger == nil {
logger = qmpNullLogger{}
}
@ -1333,6 +1338,8 @@ func LaunchCustomQemu(ctx context.Context, path string, params []string, fds []*
cmd.ExtraFiles = fds
}
cmd.SysProcAttr = attr
var stderr bytes.Buffer
cmd.Stderr = &stderr
logger.Infof("launching qemu with: %v", params)