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

save qemu pid in state directory

Browse Source 
Signed-off-by: Zachery Hostens <zacheryph@gmail.com>
This commit is contained in:
Zachery Hostens 2017-08-01 11:23:43 -05:00
parent 4daf008956
commit aa48795203
No known key found for this signature in database
GPG Key ID: 37CDFB272575E480
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,6 +32,7 @@ type QemuConfig struct {
GUI bool GUI bool
Disks Disks Disks Disks
MetadataPath string MetadataPath string
StatePath string
FWPath string FWPath string
Arch string Arch string
CPUs string CPUs string
@ -183,12 +184,9 @@ func runQemu(args []string) {
if *state == "" { if *state == "" {
*state = prefix + "-state" *state = prefix + "-state"
} }
var mkstate func()
mkstate = func() { if err := os.MkdirAll(*state, 0755); err != nil {
if err := os.MkdirAll(*state, 0755); err != nil { log.Fatalf("Could not create state directory: %v", err)
log.Fatalf("Could not create state directory: %v", err)
}
mkstate = func() {}
} }
isoPath := "" isoPath := ""
@ -202,7 +200,6 @@ func runQemu(args []string) {
log.Fatalf("Cannot read user data: %v", err) log.Fatalf("Cannot read user data: %v", err)
} }
} }
mkstate()
isoPath = filepath.Join(*state, "data.iso") isoPath = filepath.Join(*state, "data.iso")
if err := WriteMetadataISO(isoPath, d); err != nil { if err := WriteMetadataISO(isoPath, d); err != nil {
log.Fatalf("Cannot write user data ISO: %v", err) log.Fatalf("Cannot write user data ISO: %v", err)
@ -218,7 +215,6 @@ func runQemu(args []string) {
d.Format = "qcow2" d.Format = "qcow2"
} }
if d.Size != 0 && d.Path == "" { if d.Size != 0 && d.Path == "" {
mkstate()
d.Path = filepath.Join(*state, "disk"+id+".img") d.Path = filepath.Join(*state, "disk"+id+".img")
} }
if d.Path == "" { if d.Path == "" {
@ -283,6 +279,7 @@ func runQemu(args []string) {
GUI: *enableGUI, GUI: *enableGUI,
Disks: disks, Disks: disks,
MetadataPath: isoPath, MetadataPath: isoPath,
StatePath: *state,
FWPath: *fw, FWPath: *fw,
Arch: *arch, Arch: *arch,
CPUs: *cpus, CPUs: *cpus,
@ -463,6 +460,7 @@ func buildQemuCmdline(config QemuConfig) (QemuConfig, []string) {
qemuArgs = append(qemuArgs, "-smp", config.CPUs) qemuArgs = append(qemuArgs, "-smp", config.CPUs)
qemuArgs = append(qemuArgs, "-m", config.Memory) qemuArgs = append(qemuArgs, "-m", config.Memory)
qemuArgs = append(qemuArgs, "-uuid", config.UUID.String()) qemuArgs = append(qemuArgs, "-uuid", config.UUID.String())
qemuArgs = append(qemuArgs, "-pidfile", filepath.Join(config.StatePath, "qemu.pid"))
// Need to specify the vcpu type when running qemu on arm64 platform, for security reason, // Need to specify the vcpu type when running qemu on arm64 platform, for security reason,
// the vcpu should be "host" instead of other names such as "cortex-a53"... // the vcpu should be "host" instead of other names such as "cortex-a53"...
if config.Arch == "aarch64" { if config.Arch == "aarch64" {