vmm: openapi: Switch to describing new payload API

The old API remains usable, and will remain usable for two releases but
we should only advertise the new API.

Signed-off-by: Rob Bradford <robert.bradford@intel.com>

vmm/src/api/openapi/cloud-hypervisor.yaml

@@ -499,21 +499,28 @@ components:
           type: string
       description: Information about a PCI device
 
+    PayloadConfig:
+      type: object
+      properties:
+        kernel:
+          type: string
+        cmdline:
+          type: string
+        initramfs:
+          type: string
+      description: Payloads to boot in guest
+
     VmConfig:
       required:
-        - kernel
+        - payload
       type: object
       properties:
         cpus:
           $ref: "#/components/schemas/CpusConfig"
         memory:
           $ref: "#/components/schemas/MemoryConfig"
-        kernel:
+        payload:
-          $ref: "#/components/schemas/KernelConfig"
+          $ref: "#/components/schemas/PayloadConfig"
-        initramfs:
-          $ref: "#/components/schemas/InitramfsConfig"
-        cmdline:
-          $ref: "#/components/schemas/CmdLineConfig"
         disks:
           type: array
           items:
@@ -721,31 +728,6 @@ components:
           items:
             $ref: "#/components/schemas/MemoryZoneConfig"
 
-    KernelConfig:
-      required:
-        - path
-      type: object
-      properties:
-        path:
-          type: string
-
-    InitramfsConfig:
-      nullable: true
-      required:
-        - path
-      type: object
-      properties:
-        path:
-          type: string
-
-    CmdLineConfig:
-      required:
-        - args
-      type: object
-      properties:
-        args:
-          type: string
-
     TokenBucket:
       required:
         - size