diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-08-01 21:25:04 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-08-02 16:57:31 +0200 |
| commit | 15d078f2b647dfa783141d4df8f71b222669bea7 (patch) | |
| tree | 89e0677b64c50691fd843f4f55cde19a6fef4443 | |
| parent | a5892295bf7db49f94294ae111e35f3bb03091ca (diff) | |
syz-manager/mgrconfig: remove the deprecated vmlinux parameter
| -rw-r--r-- | syz-manager/mgrconfig/mgrconfig.go | 18 | ||||
| -rw-r--r-- | syz-manager/mgrconfig/testdata/qemu.cfg | 2 |
2 files changed, 6 insertions, 14 deletions
diff --git a/syz-manager/mgrconfig/mgrconfig.go b/syz-manager/mgrconfig/mgrconfig.go index 344ec25ff..bb905b155 100644 --- a/syz-manager/mgrconfig/mgrconfig.go +++ b/syz-manager/mgrconfig/mgrconfig.go @@ -25,13 +25,11 @@ type Config struct { // TCP address to serve HTTP stats page (e.g. "localhost:50000"). HTTP string `json:"http"` // TCP address to serve RPC for fuzzer processes (optional). - RPC string `json:"rpc"` - Workdir string `json:"workdir"` - VmlinuxUnused string `json:"vmlinux"` // vmlinux should go away eventually. + RPC string `json:"rpc"` + Workdir string `json:"workdir"` // Directory with kernel object files. - // If not set, inferred as base dir of Vmlinux. KernelObj string `json:"kernel_obj"` - // Kernel source directory. + // Kernel source directory (if not set defaults to KernelObj). KernelSrc string `json:"kernel_src"` // Arbitrary optional tag that is saved along with crash reports (e.g. branch/commit). Tag string `json:"tag"` @@ -195,17 +193,11 @@ func Complete(cfg *Config) error { } } - if cfg.VmlinuxUnused != "" { - fmt.Printf("WARNING: vmlinux config parameter is deprecated and will be removed soon.\n" + - "Use kernel_obj to specify vmlinux dir instead.\n") - } - cfg.VmlinuxUnused = osutil.Abs(cfg.VmlinuxUnused) - if cfg.KernelObj == "" { - cfg.KernelObj = filepath.Dir(cfg.VmlinuxUnused) // assume in-tree build by default - } + cfg.KernelObj = osutil.Abs(cfg.KernelObj) if cfg.KernelSrc == "" { cfg.KernelSrc = cfg.KernelObj // assume in-tree build by default } + cfg.KernelSrc = osutil.Abs(cfg.KernelSrc) if cfg.HubClient != "" && (cfg.Name == "" || cfg.HubAddr == "" || cfg.HubKey == "") { return fmt.Errorf("hub_client is set, but name/hub_addr/hub_key is empty") } diff --git a/syz-manager/mgrconfig/testdata/qemu.cfg b/syz-manager/mgrconfig/testdata/qemu.cfg index 2d36a2c51..f390537fd 100644 --- a/syz-manager/mgrconfig/testdata/qemu.cfg +++ b/syz-manager/mgrconfig/testdata/qemu.cfg @@ -2,7 +2,7 @@ "target": "linux/amd64", "http": "myhost.com:56741", "workdir": "/syzkaller/workdir", - "vmlinux": "/linux/vmlinux", + "kernel_obj": "/linux/", "image": "/linux_image/wheezy.img", "sshkey": "/linux_image/ssh/id_rsa", "syzkaller": "/syzkaller", |