github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 17:26:28 +00:00
Code Issues Projects Releases Wiki Activity

Fix path handling in QEMU to allow containers outside the PWD

Browse Source 
Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2017-05-08 13:50:03 +01:00 committed by Dave Tucker
parent a11c373f0c
commit 7027dc814c
1 changed files with 49 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/cmd/linuxkit/run_qemu.go
View File

@ -98,20 +98,23 @@ func runQemu(args []string) {
PublishedPorts: publishFlags, PublishedPorts: publishFlags,
} }
config, qemuArgs := buildQemuCmdline(config) config = discoverBackend(config)
var err error var err error
if config.Containerized { if config.Containerized {
err = runQemuContainer(config, qemuArgs) err = runQemuContainer(config)
} else { } else {
err = runQemuLocal(config, qemuArgs) err = runQemuLocal(config)
} }
if err != nil { if err != nil {
log.Fatal(err.Error()) log.Fatal(err.Error())
} }
} }
func runQemuLocal(config QemuConfig, args []string) error { func runQemuLocal(config QemuConfig) error {
var args []string
config, args = buildQemuCmdline(config)
if config.DiskPath != "" { if config.DiskPath != "" {
// If disk doesn't exist then create one // If disk doesn't exist then create one
if _, err := os.Stat(config.DiskPath); err != nil { if _, err := os.Stat(config.DiskPath); err != nil {
@ -154,11 +157,22 @@ func runQemuLocal(config QemuConfig, args []string) error {
return qemuCmd.Run() return qemuCmd.Run()
} }
func runQemuContainer(config QemuConfig, args []string) error { func runQemuContainer(config QemuConfig) error {
wd, err := os.Getwd() var wd string
if filepath.IsAbs(config.Prefix) {
// Split the path
wd, config.Prefix = filepath.Split(config.Prefix)
log.Debugf("Prefix: %s", config.Prefix)
} else {
var err error
wd, err = os.Getwd()
if err != nil { if err != nil {
return err return err
} }
}
var args []string
config, args = buildQemuCmdline(config)
dockerArgs := []string{"run", "-i", "--rm", "-v", fmt.Sprintf("%s:%s", wd, "/tmp"), "-w", "/tmp"} dockerArgs := []string{"run", "-i", "--rm", "-v", fmt.Sprintf("%s:%s", wd, "/tmp"), "-w", "/tmp"}
@ -217,26 +231,6 @@ func runQemuContainer(config QemuConfig, args []string) error {
} }
func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) { func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
// Before building qemu arguments, check if qemu is in the PATH or fallback to containerized
qemuBinPath := "qemu-system-" + config.Arch
qemuImgPath := "qemu-img"
var err error
config.QemuBinPath, err = exec.LookPath(qemuBinPath)
if err != nil {
log.Infof("Unable to find %s within the $PATH. Using a container", qemuBinPath)
config.Containerized = true
}
config.QemuImgPath, err = exec.LookPath(qemuImgPath)
if err != nil {
// No need to show the error message twice
if !config.Containerized {
log.Infof("Unable to find %s within the $PATH. Using a container", qemuImgPath)
config.Containerized = true
}
}
// Iterate through the flags and build arguments // Iterate through the flags and build arguments
var qemuArgs []string var qemuArgs []string
qemuArgs = append(qemuArgs, "-device", "virtio-rng-pci") qemuArgs = append(qemuArgs, "-device", "virtio-rng-pci")
@ -244,6 +238,7 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
qemuArgs = append(qemuArgs, "-m", config.Memory) qemuArgs = append(qemuArgs, "-m", config.Memory)
// Look for kvm device and enable for qemu if it exists // Look for kvm device and enable for qemu if it exists
var err error
if _, err = os.Stat("/dev/kvm"); os.IsNotExist(err) { if _, err = os.Stat("/dev/kvm"); os.IsNotExist(err) {
qemuArgs = append(qemuArgs, "-machine", "q35") qemuArgs = append(qemuArgs, "-machine", "q35")
} else { } else {
@ -302,11 +297,35 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
return config, qemuArgs return config, qemuArgs
} }
func discoverBackend(config QemuConfig) QemuConfig {
qemuBinPath := "qemu-system-" + config.Arch
qemuImgPath := "qemu-img"
var err error
config.QemuBinPath, err = exec.LookPath(qemuBinPath)
if err != nil {
log.Infof("Unable to find %s within the $PATH. Using a container", qemuBinPath)
config.Containerized = true
}
config.QemuImgPath, err = exec.LookPath(qemuImgPath)
if err != nil {
// No need to show the error message twice
if !config.Containerized {
log.Infof("Unable to find %s within the $PATH. Using a container", qemuImgPath)
config.Containerized = true
}
}
return config
}
func buildPath(prefix string, postfix string) string { func buildPath(prefix string, postfix string) string {
path := prefix + postfix path := prefix + postfix
if filepath.IsAbs(path) {
if _, err := os.Stat(path); os.IsNotExist(err) { if _, err := os.Stat(path); os.IsNotExist(err) {
log.Fatalf("File [%s] does not exist in current directory", path) log.Fatalf("File [%s] does not exist in current directory", path)
} }
}
return path return path
} }