config-vm: Recycle the hook-process schema

config-vm.md

@@ -5,17 +5,14 @@ The virtual-machine container specification provides additional configuration fo
 
 ## <a name="HypervisorObject" /> Hypervisor Object
 
-**`hypervisor`** (object, OPTIONAL) specifies details of the hypervisor that manages the container virtual machine.
-* **`path`** (string, REQUIRED) path to the hypervisor binary that manages the container virtual machine.
-    This value MUST be an absolute path in the [runtime mount namespace](glossary.md#runtime-namespace).
-* **`parameters`** (array of strings, OPTIONAL) specifies an array of parameters to pass to the hypervisor.
+**`hypervisor`** (object, OPTIONAL) configures the hypervisor process using the [hook-process schema](config.md#hook-process).
 
 ### Example
 
 ```json
     "hypervisor": {
         "path": "/path/to/vmm",
-        "parameters": ["opts1=foo", "opts2=bar"]
+        "args": ["vmm", "opts1=foo", "opts2=bar"]
     }
 ```
 

config.md

@@ -372,22 +372,27 @@ For POSIX platforms, the configuration structure supports `hooks` for configurin
 
 * **`hooks`** (object, OPTIONAL) MAY contain any of the following properties:
     * **`prestart`** (array of objects, OPTIONAL) is an array of [pre-start hooks](#prestart).
-        Entries in the array contain the following properties:
-        * **`path`** (string, REQUIRED) with similar semantics to [IEEE Std 1003.1-2008 `execv`'s *path*][ieee-1003.1-2008-functions-exec].
-            This specification extends the IEEE standard in that **`path`** MUST be absolute.
-        * **`args`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2008 `execv`'s *argv*][ieee-1003.1-2008-functions-exec].
-        * **`env`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2008's `environ`][ieee-1003.1-2008-xbd-c8.1].
-        * **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
-            If set, `timeout` MUST be greater than zero.
+        Entries in the array are [hook-process objects](#hook-process).
     * **`poststart`** (array of objects, OPTIONAL) is an array of [post-start hooks](#poststart).
-        Entries in the array have the same schema as pre-start entries.
+        Entries in the array are [hook-process objects](#hook-process).
     * **`poststop`** (array of objects, OPTIONAL) is an array of [post-stop hooks](#poststop).
-        Entries in the array have the same schema as pre-start entries.
+        Entries in the array are [hook-process objects](#hook-process).
 
 Hooks allow users to specify programs to run before or after various lifecycle events.
 Hooks MUST be called in the listed order.
 The [state](runtime.md#state) of the container MUST be passed to hooks over stdin so that they may do work appropriate to the current state of the container.
 
+### <a name="configHook" />Hook process
+
+Process configuration contains the following properties:
+
+* **`path`** (string, REQUIRED) with similar semantics to [IEEE Std 1003.1-2008 `execv`'s *path*][ieee-1003.1-2008-functions-exec].
+    This specification extends the IEEE standard in that **`path`** MUST be absolute.
+* **`args`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2008 `execv`'s *argv*][ieee-1003.1-2008-functions-exec].
+* **`env`** (array of strings, OPTIONAL) with the same semantics as [IEEE Std 1003.1-2008's `environ`][ieee-1003.1-2008-xbd-c8.1].
+* **`timeout`** (int, OPTIONAL) is the number of seconds before aborting the hook.
+    If set, `timeout` MUST be greater than zero.
+
 ### <a name="configHooksPrestart" />Prestart
 
 The pre-start hooks MUST be called after the [`start`](runtime.md#start) operation is called but [before the user-specified program command is executed](runtime.md#lifecycle).

schema/config-vm.json

@@ -7,19 +7,7 @@
         ],
         "properties": {
             "hypervisor": {
-                "description": "hypervisor config used by VM-based containers",
-                "type": "object",
-                "required": [
-                    "path"
-                ],
-                "properties": {
-                    "path": {
-                        "$ref": "defs.json#/definitions/FilePath"
-                    },
-                    "parameters": {
-                        "$ref": "defs.json#/definitions/ArrayOfStrings"
-                    }
-                }
+                "$ref": "defs.json#/definitions/Hook"
             },
             "kernel": {
                 "description": "kernel config used by VM-based containers",

specs-go/config.go

@@ -504,21 +504,13 @@ type WindowsHyperV struct {
 // VM contains information for virtual-machine-based containers.
 type VM struct {
 	// Hypervisor specifies hypervisor-related configuration for virtual-machine-based containers.
-	Hypervisor VMHypervisor `json:"hypervisor,omitempty"`
+	Hypervisor *Hook `json:"hypervisor,omitempty"`
 	// Kernel specifies kernel-related configuration for virtual-machine-based containers.
 	Kernel VMKernel `json:"kernel"`
 	// Image specifies guest image related configuration for virtual-machine-based containers.
 	Image VMImage `json:"image,omitempty"`
 }
 
-// VMHypervisor contains information about the hypervisor to use for a virtual machine.
-type VMHypervisor struct {
-	// Path is the host path to the hypervisor used to manage the virtual machine.
-	Path string `json:"path"`
-	// Parameters specifies parameters to pass to the hypervisor.
-	Parameters string `json:"parameters,omitempty"`
-}
-
 // VMKernel contains information about the kernel to use for a virtual machine.
 type VMKernel struct {
 	// Path is the host path to the kernel used to boot the virtual machine.