reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-27 21:30:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg/instance: support injected boot for vmm

Browse Source 
If pkg/build produces a kernel, inject it into vmm config too.
This will allow continuous build with vmm VM type.

Update #712
This commit is contained in:
Dmitry Vyukov 2018-09-11 16:10:50 +02:00
parent ff2962ae80
commit 4ae17b1f4c
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/instance/instance.go
View File

@ -93,7 +93,7 @@ func SetConfigImage(cfg *mgrconfig.Config, imageDir string) error {
if keyFile := filepath.Join(imageDir, "key"); osutil.IsExist(keyFile) {
cfg.SSHKey = keyFile
}
if cfg.Type == "qemu" {
if cfg.Type == "qemu" || cfg.Type == "vmm" {
kernel := filepath.Join(imageDir, "kernel")
if !osutil.IsExist(kernel) {
kernel = ""
@ -103,19 +103,19 @@ func SetConfigImage(cfg *mgrconfig.Config, imageDir string) error {
initrd = ""
}
if kernel != "" || initrd != "" {
qemu := make(map[string]interface{})
if err := json.Unmarshal(cfg.VM, &qemu); err != nil {
return fmt.Errorf("failed to parse qemu config: %v", err)
vmConfig := make(map[string]interface{})
if err := json.Unmarshal(cfg.VM, &vmConfig); err != nil {
return fmt.Errorf("failed to parse VM config: %v", err)
}
if kernel != "" {
qemu["kernel"] = kernel
vmConfig["kernel"] = kernel
}
if initrd != "" {
qemu["initrd"] = initrd
vmConfig["initrd"] = initrd
}
vmCfg, err := json.Marshal(qemu)
vmCfg, err := json.Marshal(vmConfig)
if err != nil {
return fmt.Errorf("failed to serialize qemu config: %v", err)
return fmt.Errorf("failed to serialize VM config: %v", err)
}
cfg.VM = vmCfg
}