syz-manager/mgrconfig: move sshkey from vm config to manager config

Sshkey is a property of image, which is in manager config.
Move sshkey to the same location as image.

The motivation for the move is as follows.
Continuous build produces an image and the key,
both need to be passed manager instance.
Continuous build system should not distinguish
different VM types and mess with their configs.

NOTE FOR USERS: this breaks manager configs again.
Hopefully the last time for now. Docs are updated.

4 files changed, 6 insertions, 6 deletions

diff --git a/docs/configuration.md b/docs/configuration.md
index 72f12bea7..180affe19 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -16,6 +16,8 @@ following keys in its top-level object:
  - `leak`: Detect memory leaks with kmemleak.
  - `image`: Location of the disk image file for the QEMU instance; a copy of this file is passed as the
    `-hda` option to `qemu-system-x86_64`.
+ - `sshkey`: Location (on the host machine) of a root SSH identity to use for communicating with
+   the virtual machine.
  - `sandbox` : Sandboxing mode, the following modes are supported:
      - "none": don't do anything special (has false positives, e.g. due to killing init)
      - "setuid": impersonate into user nobody (65534), default
@@ -31,8 +33,6 @@ following keys in its top-level object:
      - `kernel`: Location of the `bzImage` file for the kernel to be tested;
        this is passed as the `-kernel` option to `qemu-system-x86_64`.
      - `cmdline`: Additional command line options for the booting kernel, for example `root=/dev/sda1`.
-     - `sshkey`: Location (on the host machine) of an SSH identity to use for communicating with
-       the virtual machine.
      - `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`.
 
diff --git a/docs/setup_linux-host_qemu-vm_arm64-kernel.md b/docs/setup_linux-host_qemu-vm_arm64-kernel.md
index 2a08d4144..3d21d8497 100644
--- a/docs/setup_linux-host_qemu-vm_arm64-kernel.md
+++ b/docs/setup_linux-host_qemu-vm_arm64-kernel.md
@@ -133,6 +133,7 @@ A sample config file that exercises the required options are shown below. Modify
     "vmlinux": “/path/to/vmlinux",
     "syzkaller": "/path/to/syzkaller/arm64/",
     "image": "/path/to/rootfs.ext3",
+    "sshkey": "/path/to/ida_rsa",
     "procs": 8,
     "type": "qemu",
     "vm": {
@@ -141,7 +142,6 @@ A sample config file that exercises the required options are shown below. Modify
         "qemu_args": "-machine virt -cpu cortex-a57",
         "cmdline": "console=ttyAMA0 root=/dev/vda",
         "kernel": “/path/to/Image",
-        "sshkey": "/path/to/ida_rsa",
         "cpu": 2,
         "mem": 2048
     }
diff --git a/docs/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md b/docs/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md
index d8aee0563..899beaaa8 100644
--- a/docs/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md
+++ b/docs/setup_ubuntu-host_odroid-c2-board_arm64-kernel.md
@@ -300,13 +300,13 @@ Use the following config:
 	"workdir": "/syzkaller/workdir",
 	"vmlinux": "/linux-next/vmlinux",
 	"syzkaller": "/go/src/github.com/google/syzkaller",
+	"sshkey": "/odroid/ssh/id_rsa",
 	"rpc": "172.16.0.30:0",
 	"sandbox": "namespace",
 	"reproduce": false,
 	"procs": 8,
 	"type": "odroid",
 	"vm": {
-		"sshkey": "/odroid/ssh/id_rsa",
 		"host_addr": "172.16.0.30",
 		"slave_addr": "172.16.0.31",
 		"console": "/dev/ttyUSB0",
@@ -320,7 +320,7 @@ Use the following config:
 Don't forget to update:
  - `workdir` (path to the workdir)
  - `vmlinux` (path to the `vmlinux` binary)
- - `vm.sshkey` (path to the generated ssh private key)
+ - `sshkey` (path to the generated ssh private key)
  - `vm.console` (serial device you used in `minicom`)
  - `vm.hub_bus` (number of the bus to which USB hub is connected, view with `lsusb`)
  - `vm.hub_device` (device number for the USB hub, view with `lsusb`)
diff --git a/docs/setup_ubuntu-host_qemu-vm_x86-64-kernel.md b/docs/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
index 054ea3b5b..41e87ca88 100644
--- a/docs/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
+++ b/docs/setup_ubuntu-host_qemu-vm_x86-64-kernel.md
@@ -213,13 +213,13 @@ Create manager config like this:
 	"workdir": "/gopath/src/github.com/google/syzkaller/workdir",
 	"vmlinux": "/linux/upstream/vmlinux",
 	"image": "/image/wheezy.img",
+	"sshkey": "/image/ssh/id_rsa",
 	"syzkaller": "/gopath/src/github.com/google/syzkaller",
 	"procs": 8,
 	"type": "qemu",
 	"vm": {
 		"count": 4,
 		"kernel": "/linux/arch/x86/boot/bzImage",
-		"sshkey": "/image/ssh/id_rsa",
 		"cpu": 2,
 		"mem": 2048
 	}