aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--docs/configuration.md4
-rw-r--r--pkg/bisect/bisect.go2
-rw-r--r--pkg/csource/options.go2
-rw-r--r--pkg/instance/instance.go2
-rw-r--r--pkg/mgrconfig/mgrconfig.go (renamed from syz-manager/mgrconfig/mgrconfig.go)0
-rw-r--r--pkg/mgrconfig/mgrconfig_test.go (renamed from syz-manager/mgrconfig/mgrconfig_test.go)0
-rw-r--r--pkg/mgrconfig/testdata/gce1.cfg (renamed from syz-manager/mgrconfig/testdata/gce1.cfg)0
-rw-r--r--pkg/mgrconfig/testdata/gce2.cfg (renamed from syz-manager/mgrconfig/testdata/gce2.cfg)0
-rw-r--r--pkg/mgrconfig/testdata/qemu.cfg (renamed from syz-manager/mgrconfig/testdata/qemu.cfg)0
-rw-r--r--pkg/report/linux_test.go2
-rw-r--r--pkg/report/report.go2
-rw-r--r--pkg/report/report_test.go2
-rw-r--r--pkg/repro/repro.go2
-rw-r--r--syz-ci/jobs.go2
-rw-r--r--syz-ci/manager.go2
-rw-r--r--syz-ci/syz-ci.go2
-rw-r--r--syz-ci/syzupdater.go2
-rw-r--r--syz-manager/manager.go2
-rw-r--r--tools/syz-bisect/bisect.go2
-rw-r--r--tools/syz-crush/crush.go2
-rw-r--r--tools/syz-mutate/mutate.go2
-rw-r--r--tools/syz-repro/repro.go2
-rw-r--r--tools/syz-symbolize/symbolize.go2
-rw-r--r--vm/vm.go2
24 files changed, 20 insertions, 20 deletions
diff --git a/docs/configuration.md b/docs/configuration.md
index c87b0c3cb..036615f2c 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -2,7 +2,7 @@
The operation of the syzkaller `syz-manager` process is governed by a configuration file, passed at
invocation time with the `-config` option. This configuration can be based on the
-[example](/syz-manager/mgrconfig/testdata/qemu.cfg); the file is in JSON format with the
+[example](/pkg/mgrconfig/testdata/qemu.cfg); the file is in JSON format with the
following keys in its top-level object:
- `http`: URL that will display information about the running `syz-manager` process.
@@ -40,4 +40,4 @@ following keys in its top-level object:
- `cpu`: Number of CPUs to simulate in the VM (*not currently used*).
- `mem`: Amount of memory (in MiB) for the VM; this is passed as the `-m` option to `qemu-system-x86_64`.
-See also [config.go](/syz-manager/mgrconfig/mgrconfig.go) for all config parameters.
+See also [config.go](/pkg/mgrconfig/mgrconfig.go) for all config parameters.
diff --git a/pkg/bisect/bisect.go b/pkg/bisect/bisect.go
index bd9501084..c78508368 100644
--- a/pkg/bisect/bisect.go
+++ b/pkg/bisect/bisect.go
@@ -11,9 +11,9 @@ import (
"github.com/google/syzkaller/pkg/build"
"github.com/google/syzkaller/pkg/instance"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/vcs"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
type Config struct {
diff --git a/pkg/csource/options.go b/pkg/csource/options.go
index 061b20246..1cfc627ee 100644
--- a/pkg/csource/options.go
+++ b/pkg/csource/options.go
@@ -9,7 +9,7 @@ import (
"errors"
"fmt"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
+ "github.com/google/syzkaller/pkg/mgrconfig"
)
// Options control various aspects of source generation.
diff --git a/pkg/instance/instance.go b/pkg/instance/instance.go
index ff3240f52..102d90ca5 100644
--- a/pkg/instance/instance.go
+++ b/pkg/instance/instance.go
@@ -18,11 +18,11 @@ import (
"github.com/google/syzkaller/pkg/build"
"github.com/google/syzkaller/pkg/csource"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/pkg/vcs"
"github.com/google/syzkaller/prog"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm"
)
diff --git a/syz-manager/mgrconfig/mgrconfig.go b/pkg/mgrconfig/mgrconfig.go
index 1b2052838..1b2052838 100644
--- a/syz-manager/mgrconfig/mgrconfig.go
+++ b/pkg/mgrconfig/mgrconfig.go
diff --git a/syz-manager/mgrconfig/mgrconfig_test.go b/pkg/mgrconfig/mgrconfig_test.go
index 1e4dc95fd..1e4dc95fd 100644
--- a/syz-manager/mgrconfig/mgrconfig_test.go
+++ b/pkg/mgrconfig/mgrconfig_test.go
diff --git a/syz-manager/mgrconfig/testdata/gce1.cfg b/pkg/mgrconfig/testdata/gce1.cfg
index 44b4eae12..44b4eae12 100644
--- a/syz-manager/mgrconfig/testdata/gce1.cfg
+++ b/pkg/mgrconfig/testdata/gce1.cfg
diff --git a/syz-manager/mgrconfig/testdata/gce2.cfg b/pkg/mgrconfig/testdata/gce2.cfg
index cf9a620f2..cf9a620f2 100644
--- a/syz-manager/mgrconfig/testdata/gce2.cfg
+++ b/pkg/mgrconfig/testdata/gce2.cfg
diff --git a/syz-manager/mgrconfig/testdata/qemu.cfg b/pkg/mgrconfig/testdata/qemu.cfg
index f390537fd..f390537fd 100644
--- a/syz-manager/mgrconfig/testdata/qemu.cfg
+++ b/pkg/mgrconfig/testdata/qemu.cfg
diff --git a/pkg/report/linux_test.go b/pkg/report/linux_test.go
index 162f6638e..83b631f55 100644
--- a/pkg/report/linux_test.go
+++ b/pkg/report/linux_test.go
@@ -7,8 +7,8 @@ import (
"fmt"
"testing"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/symbolizer"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
func TestLinuxIgnores(t *testing.T) {
diff --git a/pkg/report/report.go b/pkg/report/report.go
index 1a6e76505..4a7c43145 100644
--- a/pkg/report/report.go
+++ b/pkg/report/report.go
@@ -12,7 +12,7 @@ import (
"regexp"
"strings"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
+ "github.com/google/syzkaller/pkg/mgrconfig"
)
type Reporter interface {
diff --git a/pkg/report/report_test.go b/pkg/report/report_test.go
index a68d7d149..7012b54f2 100644
--- a/pkg/report/report_test.go
+++ b/pkg/report/report_test.go
@@ -15,8 +15,8 @@ import (
"strings"
"testing"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
var flagUpdate = flag.Bool("update", false, "update test files accordingly to current results")
diff --git a/pkg/repro/repro.go b/pkg/repro/repro.go
index 5d6670a20..a10e02f27 100644
--- a/pkg/repro/repro.go
+++ b/pkg/repro/repro.go
@@ -14,10 +14,10 @@ import (
"github.com/google/syzkaller/pkg/csource"
instancePkg "github.com/google/syzkaller/pkg/instance"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/prog"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm"
)
diff --git a/syz-ci/jobs.go b/syz-ci/jobs.go
index edb47ac62..02c8c0a50 100644
--- a/syz-ci/jobs.go
+++ b/syz-ci/jobs.go
@@ -14,9 +14,9 @@ import (
"github.com/google/syzkaller/pkg/build"
"github.com/google/syzkaller/pkg/instance"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/vcs"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
type JobProcessor struct {
diff --git a/syz-ci/manager.go b/syz-ci/manager.go
index 4693e0836..3c254ad2f 100644
--- a/syz-ci/manager.go
+++ b/syz-ci/manager.go
@@ -16,10 +16,10 @@ import (
"github.com/google/syzkaller/pkg/hash"
"github.com/google/syzkaller/pkg/instance"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/pkg/vcs"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
// This is especially slightly longer than syzkaller rebuild period.
diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go
index c75004e77..9f47c068b 100644
--- a/syz-ci/syz-ci.go
+++ b/syz-ci/syz-ci.go
@@ -61,8 +61,8 @@ import (
"github.com/google/syzkaller/pkg/config"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
var flagConfig = flag.String("config", "", "config file")
diff --git a/syz-ci/syzupdater.go b/syz-ci/syzupdater.go
index 87f6c61ca..a6ae3fff8 100644
--- a/syz-ci/syzupdater.go
+++ b/syz-ci/syzupdater.go
@@ -13,9 +13,9 @@ import (
"time"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/vcs"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
const (
diff --git a/syz-manager/manager.go b/syz-manager/manager.go
index 86bbf8e28..6f4eae68b 100644
--- a/syz-manager/manager.go
+++ b/syz-manager/manager.go
@@ -25,6 +25,7 @@ import (
"github.com/google/syzkaller/pkg/hash"
"github.com/google/syzkaller/pkg/instance"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/pkg/repro"
@@ -32,7 +33,6 @@ import (
"github.com/google/syzkaller/pkg/signal"
"github.com/google/syzkaller/prog"
"github.com/google/syzkaller/sys"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm"
)
diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go
index 0f4657223..ec68f4b95 100644
--- a/tools/syz-bisect/bisect.go
+++ b/tools/syz-bisect/bisect.go
@@ -14,7 +14,7 @@ import (
"github.com/google/syzkaller/pkg/bisect"
"github.com/google/syzkaller/pkg/config"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
+ "github.com/google/syzkaller/pkg/mgrconfig"
)
var (
diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go
index ee020b74f..3d184d5a4 100644
--- a/tools/syz-crush/crush.go
+++ b/tools/syz-crush/crush.go
@@ -15,10 +15,10 @@ import (
"github.com/google/syzkaller/pkg/instance"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/prog"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm"
)
diff --git a/tools/syz-mutate/mutate.go b/tools/syz-mutate/mutate.go
index 73957c246..c3038064f 100644
--- a/tools/syz-mutate/mutate.go
+++ b/tools/syz-mutate/mutate.go
@@ -14,9 +14,9 @@ import (
"strings"
"time"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/prog"
_ "github.com/google/syzkaller/sys"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
var (
diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go
index d585ed9a1..d406f34c8 100644
--- a/tools/syz-repro/repro.go
+++ b/tools/syz-repro/repro.go
@@ -11,11 +11,11 @@ import (
"github.com/google/syzkaller/pkg/csource"
"github.com/google/syzkaller/pkg/log"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
"github.com/google/syzkaller/pkg/repro"
"github.com/google/syzkaller/prog"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm"
)
diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go
index 169dad840..8ce2f73ff 100644
--- a/tools/syz-symbolize/symbolize.go
+++ b/tools/syz-symbolize/symbolize.go
@@ -10,8 +10,8 @@ import (
"os"
"runtime"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/report"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
)
var (
diff --git a/vm/vm.go b/vm/vm.go
index 645d3a397..efd11e69b 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -14,9 +14,9 @@ import (
"os"
"time"
+ "github.com/google/syzkaller/pkg/mgrconfig"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/pkg/report"
- "github.com/google/syzkaller/syz-manager/mgrconfig"
"github.com/google/syzkaller/vm/vmimpl"
// Import all VM implementations, so that users only need to import vm.
generated by ggit (джигит) mrf-deployment (git 2.46.0) at 2026-03-11 20:10:29 +0000