]> git.proxmox.com Git - pve-docs.git/commitdiff
run make update-static
authorThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 29 Nov 2018 12:12:20 +0000 (13:12 +0100)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Thu, 29 Nov 2018 12:12:20 +0000 (13:12 +0100)
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
api-viewer/apidata.js
pct.1-synopsis.adoc
pct.conf.5-opts.adoc
pveceph.1-synopsis.adoc
pvecm.1-synopsis.adoc
pvesm.1-synopsis.adoc
pveum.1-synopsis.adoc
qm-cloud-init-opts.adoc
qm.1-synopsis.adoc
qm.conf.5-opts.adoc

index e672d650bc63cbf0c6c3753a09bb01eebd892a26..60e0a238d8076d5371992170673939d2de9ab18b 100644 (file)
@@ -314,7 +314,7 @@ var pveapi = [
                               }
                            },
                            "POST" : {
-                              "description" : "Adds a node to the cluster configuration.",
+                              "description" : "Adds a node to the cluster configuration. This call is for internal use.",
                               "method" : "POST",
                               "name" : "addnode",
                               "parameters" : {
@@ -794,8 +794,54 @@ var pveapi = [
                                     "proxyto" : null,
                                     "returns" : {
                                        "properties" : {
+                                          "action" : {
+                                             "type" : "string"
+                                          },
+                                          "comment" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "dest" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "dport" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "enable" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
+                                          "iface" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "ipversion" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
+                                          "macro" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
                                           "pos" : {
                                              "type" : "integer"
+                                          },
+                                          "proto" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "source" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "sport" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "type" : {
+                                             "type" : "string"
                                           }
                                        },
                                        "type" : "object"
@@ -1324,8 +1370,54 @@ var pveapi = [
                               "proxyto" : null,
                               "returns" : {
                                  "properties" : {
+                                    "action" : {
+                                       "type" : "string"
+                                    },
+                                    "comment" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "dest" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "dport" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "enable" : {
+                                       "optional" : 1,
+                                       "type" : "integer"
+                                    },
+                                    "iface" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "ipversion" : {
+                                       "optional" : 1,
+                                       "type" : "integer"
+                                    },
+                                    "macro" : {
+                                       "optional" : 1,
+                                       "type" : "integer"
+                                    },
                                     "pos" : {
                                        "type" : "integer"
+                                    },
+                                    "proto" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "source" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "sport" : {
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    },
+                                    "type" : {
+                                       "type" : "string"
                                     }
                                  },
                                  "type" : "object"
@@ -4741,8 +4833,54 @@ var pveapi = [
                                                 "proxyto" : null,
                                                 "returns" : {
                                                    "properties" : {
+                                                      "action" : {
+                                                         "type" : "string"
+                                                      },
+                                                      "comment" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "dest" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "dport" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "enable" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
+                                                      "iface" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "ipversion" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
+                                                      "macro" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
                                                       "pos" : {
                                                          "type" : "integer"
+                                                      },
+                                                      "proto" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "source" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "sport" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "type" : {
+                                                         "type" : "string"
                                                       }
                                                    },
                                                    "type" : "object"
@@ -7873,6 +8011,15 @@ var pveapi = [
                                              "optional" : 1,
                                              "type" : "string"
                                           },
+                                          "arch" : {
+                                             "description" : "Virtual processor architecture. Defaults to the host.",
+                                             "enum" : [
+                                                "x86_64",
+                                                "aarch64"
+                                             ],
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
                                           "args" : {
                                              "description" : "Arbitrary arguments passed to kvm.",
                                              "optional" : 1,
@@ -8495,7 +8642,7 @@ var pveapi = [
                                              "description" : "Specifies the Qemu machine type.",
                                              "maxLength" : 40,
                                              "optional" : 1,
-                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?)",
+                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?|virt(?:-\\d+\\.\\d+)?)",
                                              "type" : "string"
                                           },
                                           "memory" : {
@@ -9510,24 +9657,40 @@ var pveapi = [
                                              "type" : "integer"
                                           },
                                           "vga" : {
-                                             "description" : "Select the VGA type.",
-                                             "enum" : [
-                                                "cirrus",
-                                                "qxl",
-                                                "qxl2",
-                                                "qxl3",
-                                                "qxl4",
-                                                "serial0",
-                                                "serial1",
-                                                "serial2",
-                                                "serial3",
-                                                "std",
-                                                "virtio",
-                                                "vmware"
-                                             ],
+                                             "description" : "Configure the VGA hardware.",
+                                             "format" : {
+                                                "memory" : {
+                                                   "description" : "Sets the VGA memory (in MiB). Has no effect with serial display.",
+                                                   "maximum" : 512,
+                                                   "minimum" : 4,
+                                                   "optional" : 1,
+                                                   "type" : "integer"
+                                                },
+                                                "type" : {
+                                                   "default" : "std",
+                                                   "default_key" : 1,
+                                                   "description" : "Select the VGA type.",
+                                                   "enum" : [
+                                                      "cirrus",
+                                                      "qxl",
+                                                      "qxl2",
+                                                      "qxl3",
+                                                      "qxl4",
+                                                      "serial0",
+                                                      "serial1",
+                                                      "serial2",
+                                                      "serial3",
+                                                      "std",
+                                                      "virtio",
+                                                      "vmware"
+                                                   ],
+                                                   "optional" : 1,
+                                                   "type" : "string"
+                                                }
+                                             },
                                              "optional" : 1,
                                              "type" : "string",
-                                             "verbose_description" : "Select the VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use the options 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrus' for other OS types. The 'qxl' option enables the SPICE display sever. For win* OS you can select how many independent displays you want, Linux guests can add displays them self. You can also run without any graphic card, using a serial device as terminal."
+                                             "verbose_description" : "Configure the VGA Hardware. If you want to use high resolution modes (>= 1280x1024x16) you may need to increase the vga memory option. Since QEMU 2.9 the default VGA display type is 'std' for all OS types besides some Windows versions (XP and older) which use 'cirrus'. The 'qxl' option enables the SPICE display server. For win* OS you can select how many independent displays you want, Linux guests can add displays them self.\nYou can also run without any graphic card, using a serial device as terminal."
                                           },
                                           "virtio[n]" : {
                                              "description" : "Use volume as VIRTIO hard disk (n is 0 to 15).",
@@ -9898,6 +10061,15 @@ var pveapi = [
                                              "type" : "string",
                                              "typetext" : "[enabled=]<1|0> [,fstrim_cloned_disks=<1|0>]"
                                           },
+                                          "arch" : {
+                                             "description" : "Virtual processor architecture. Defaults to the host.",
+                                             "enum" : [
+                                                "x86_64",
+                                                "aarch64"
+                                             ],
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
                                           "args" : {
                                              "description" : "Arbitrary arguments passed to kvm.",
                                              "optional" : 1,
@@ -10156,7 +10328,7 @@ var pveapi = [
                                              "format" : "pve-qm-hostpci",
                                              "optional" : 1,
                                              "type" : "string",
-                                             "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
+                                             "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                              "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
                                           },
                                           "hotplug" : {
@@ -10563,7 +10735,7 @@ var pveapi = [
                                              "description" : "Specifies the Qemu machine type.",
                                              "maxLength" : 40,
                                              "optional" : 1,
-                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?)",
+                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?|virt(?:-\\d+\\.\\d+)?)",
                                              "type" : "string"
                                           },
                                           "memory" : {
@@ -11622,24 +11794,41 @@ var pveapi = [
                                              "typetext" : "<integer> (1 - N)"
                                           },
                                           "vga" : {
-                                             "description" : "Select the VGA type.",
-                                             "enum" : [
-                                                "cirrus",
-                                                "qxl",
-                                                "qxl2",
-                                                "qxl3",
-                                                "qxl4",
-                                                "serial0",
-                                                "serial1",
-                                                "serial2",
-                                                "serial3",
-                                                "std",
-                                                "virtio",
-                                                "vmware"
-                                             ],
+                                             "description" : "Configure the VGA hardware.",
+                                             "format" : {
+                                                "memory" : {
+                                                   "description" : "Sets the VGA memory (in MiB). Has no effect with serial display.",
+                                                   "maximum" : 512,
+                                                   "minimum" : 4,
+                                                   "optional" : 1,
+                                                   "type" : "integer"
+                                                },
+                                                "type" : {
+                                                   "default" : "std",
+                                                   "default_key" : 1,
+                                                   "description" : "Select the VGA type.",
+                                                   "enum" : [
+                                                      "cirrus",
+                                                      "qxl",
+                                                      "qxl2",
+                                                      "qxl3",
+                                                      "qxl4",
+                                                      "serial0",
+                                                      "serial1",
+                                                      "serial2",
+                                                      "serial3",
+                                                      "std",
+                                                      "virtio",
+                                                      "vmware"
+                                                   ],
+                                                   "optional" : 1,
+                                                   "type" : "string"
+                                                }
+                                             },
                                              "optional" : 1,
                                              "type" : "string",
-                                             "verbose_description" : "Select the VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use the options 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrus' for other OS types. The 'qxl' option enables the SPICE display sever. For win* OS you can select how many independent displays you want, Linux guests can add displays them self. You can also run without any graphic card, using a serial device as terminal."
+                                             "typetext" : "[[type=]<enum>] [,memory=<integer>]",
+                                             "verbose_description" : "Configure the VGA Hardware. If you want to use high resolution modes (>= 1280x1024x16) you may need to increase the vga memory option. Since QEMU 2.9 the default VGA display type is 'std' for all OS types besides some Windows versions (XP and older) which use 'cirrus'. The 'qxl' option enables the SPICE display server. For win* OS you can select how many independent displays you want, Linux guests can add displays them self.\nYou can also run without any graphic card, using a serial device as terminal."
                                           },
                                           "virtio[n]" : {
                                              "description" : "Use volume as VIRTIO hard disk (n is 0 to 15).",
@@ -12042,6 +12231,15 @@ var pveapi = [
                                              "type" : "string",
                                              "typetext" : "[enabled=]<1|0> [,fstrim_cloned_disks=<1|0>]"
                                           },
+                                          "arch" : {
+                                             "description" : "Virtual processor architecture. Defaults to the host.",
+                                             "enum" : [
+                                                "x86_64",
+                                                "aarch64"
+                                             ],
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
                                           "args" : {
                                              "description" : "Arbitrary arguments passed to kvm.",
                                              "optional" : 1,
@@ -12292,7 +12490,7 @@ var pveapi = [
                                              "format" : "pve-qm-hostpci",
                                              "optional" : 1,
                                              "type" : "string",
-                                             "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
+                                             "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                              "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
                                           },
                                           "hotplug" : {
@@ -12699,7 +12897,7 @@ var pveapi = [
                                              "description" : "Specifies the Qemu machine type.",
                                              "maxLength" : 40,
                                              "optional" : 1,
-                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?)",
+                                             "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?|virt(?:-\\d+\\.\\d+)?)",
                                              "type" : "string"
                                           },
                                           "memory" : {
@@ -13758,24 +13956,41 @@ var pveapi = [
                                              "typetext" : "<integer> (1 - N)"
                                           },
                                           "vga" : {
-                                             "description" : "Select the VGA type.",
-                                             "enum" : [
-                                                "cirrus",
-                                                "qxl",
-                                                "qxl2",
-                                                "qxl3",
-                                                "qxl4",
-                                                "serial0",
-                                                "serial1",
-                                                "serial2",
-                                                "serial3",
-                                                "std",
-                                                "virtio",
-                                                "vmware"
-                                             ],
+                                             "description" : "Configure the VGA hardware.",
+                                             "format" : {
+                                                "memory" : {
+                                                   "description" : "Sets the VGA memory (in MiB). Has no effect with serial display.",
+                                                   "maximum" : 512,
+                                                   "minimum" : 4,
+                                                   "optional" : 1,
+                                                   "type" : "integer"
+                                                },
+                                                "type" : {
+                                                   "default" : "std",
+                                                   "default_key" : 1,
+                                                   "description" : "Select the VGA type.",
+                                                   "enum" : [
+                                                      "cirrus",
+                                                      "qxl",
+                                                      "qxl2",
+                                                      "qxl3",
+                                                      "qxl4",
+                                                      "serial0",
+                                                      "serial1",
+                                                      "serial2",
+                                                      "serial3",
+                                                      "std",
+                                                      "virtio",
+                                                      "vmware"
+                                                   ],
+                                                   "optional" : 1,
+                                                   "type" : "string"
+                                                }
+                                             },
                                              "optional" : 1,
                                              "type" : "string",
-                                             "verbose_description" : "Select the VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use the options 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrus' for other OS types. The 'qxl' option enables the SPICE display sever. For win* OS you can select how many independent displays you want, Linux guests can add displays them self. You can also run without any graphic card, using a serial device as terminal."
+                                             "typetext" : "[[type=]<enum>] [,memory=<integer>]",
+                                             "verbose_description" : "Configure the VGA Hardware. If you want to use high resolution modes (>= 1280x1024x16) you may need to increase the vga memory option. Since QEMU 2.9 the default VGA display type is 'std' for all OS types besides some Windows versions (XP and older) which use 'cirrus'. The 'qxl' option enables the SPICE display server. For win* OS you can select how many independent displays you want, Linux guests can add displays them self.\nYou can also run without any graphic card, using a serial device as terminal."
                                           },
                                           "virtio[n]" : {
                                              "description" : "Use volume as VIRTIO hard disk (n is 0 to 15).",
@@ -14664,7 +14879,7 @@ var pveapi = [
                                                    "description" : "Specifies the Qemu machine type.",
                                                    "maxLength" : 40,
                                                    "optional" : 1,
-                                                   "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?)",
+                                                   "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?|virt(?:-\\d+\\.\\d+)?)",
                                                    "type" : "string"
                                                 },
                                                 "migratedfrom" : {
@@ -16454,6 +16669,15 @@ var pveapi = [
                                  "type" : "string",
                                  "typetext" : "[enabled=]<1|0> [,fstrim_cloned_disks=<1|0>]"
                               },
+                              "arch" : {
+                                 "description" : "Virtual processor architecture. Defaults to the host.",
+                                 "enum" : [
+                                    "x86_64",
+                                    "aarch64"
+                                 ],
+                                 "optional" : 1,
+                                 "type" : "string"
+                              },
                               "archive" : {
                                  "description" : "The backup file.",
                                  "maxLength" : 255,
@@ -16704,7 +16928,7 @@ var pveapi = [
                                  "format" : "pve-qm-hostpci",
                                  "optional" : 1,
                                  "type" : "string",
-                                 "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
+                                 "typetext" : "[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]",
                                  "verbose_description" : "Map host PCI devices into guest.\n\nNOTE: This option allows direct access to host hardware. So it is no longer \npossible to migrate such machines - use with special care.\n\nCAUTION: Experimental! User reported problems with this option.\n"
                               },
                               "hotplug" : {
@@ -17111,7 +17335,7 @@ var pveapi = [
                                  "description" : "Specifies the Qemu machine type.",
                                  "maxLength" : 40,
                                  "optional" : 1,
-                                 "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?)",
+                                 "pattern" : "(pc|pc(-i440fx)?-\\d+\\.\\d+(\\.pxe)?|q35|pc-q35-\\d+\\.\\d+(\\.pxe)?|virt(?:-\\d+\\.\\d+)?)",
                                  "type" : "string"
                               },
                               "memory" : {
@@ -18185,24 +18409,41 @@ var pveapi = [
                                  "typetext" : "<integer> (1 - N)"
                               },
                               "vga" : {
-                                 "description" : "Select the VGA type.",
-                                 "enum" : [
-                                    "cirrus",
-                                    "qxl",
-                                    "qxl2",
-                                    "qxl3",
-                                    "qxl4",
-                                    "serial0",
-                                    "serial1",
-                                    "serial2",
-                                    "serial3",
-                                    "std",
-                                    "virtio",
-                                    "vmware"
-                                 ],
+                                 "description" : "Configure the VGA hardware.",
+                                 "format" : {
+                                    "memory" : {
+                                       "description" : "Sets the VGA memory (in MiB). Has no effect with serial display.",
+                                       "maximum" : 512,
+                                       "minimum" : 4,
+                                       "optional" : 1,
+                                       "type" : "integer"
+                                    },
+                                    "type" : {
+                                       "default" : "std",
+                                       "default_key" : 1,
+                                       "description" : "Select the VGA type.",
+                                       "enum" : [
+                                          "cirrus",
+                                          "qxl",
+                                          "qxl2",
+                                          "qxl3",
+                                          "qxl4",
+                                          "serial0",
+                                          "serial1",
+                                          "serial2",
+                                          "serial3",
+                                          "std",
+                                          "virtio",
+                                          "vmware"
+                                       ],
+                                       "optional" : 1,
+                                       "type" : "string"
+                                    }
+                                 },
                                  "optional" : 1,
                                  "type" : "string",
-                                 "verbose_description" : "Select the VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use the options 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrus' for other OS types. The 'qxl' option enables the SPICE display sever. For win* OS you can select how many independent displays you want, Linux guests can add displays them self. You can also run without any graphic card, using a serial device as terminal."
+                                 "typetext" : "[[type=]<enum>] [,memory=<integer>]",
+                                 "verbose_description" : "Configure the VGA Hardware. If you want to use high resolution modes (>= 1280x1024x16) you may need to increase the vga memory option. Since QEMU 2.9 the default VGA display type is 'std' for all OS types besides some Windows versions (XP and older) which use 'cirrus'. The 'qxl' option enables the SPICE display server. For win* OS you can select how many independent displays you want, Linux guests can add displays them self.\nYou can also run without any graphic card, using a serial device as terminal."
                               },
                               "virtio[n]" : {
                                  "description" : "Use volume as VIRTIO hard disk (n is 0 to 15).",
@@ -18666,6 +18907,12 @@ var pveapi = [
                                           "features" : {
                                              "description" : "Allow containers access to advanced features.",
                                              "format" : {
+                                                "fuse" : {
+                                                   "default" : 0,
+                                                   "description" : "Allow using 'fuse' file systems in a container. Note that interactions between fuse and the freezer cgroup can potentially cause I/O deadlocks.",
+                                                   "optional" : 1,
+                                                   "type" : "boolean"
+                                                },
                                                 "keyctl" : {
                                                    "default" : 0,
                                                    "description" : "For unprivileged containers only: Allow the use of the keyctl() system call. This is required to use docker inside a container. By default unprivileged containers will see this system call as non-existent. This is mostly a workaround for systemd-networkd, as it will treat it as a fatal error when some keyctl() operations are denied by the kernel due to lacking permissions. Essentially, you can choose between running systemd-networkd or docker.",
@@ -19103,6 +19350,12 @@ var pveapi = [
                                           "features" : {
                                              "description" : "Allow containers access to advanced features.",
                                              "format" : {
+                                                "fuse" : {
+                                                   "default" : 0,
+                                                   "description" : "Allow using 'fuse' file systems in a container. Note that interactions between fuse and the freezer cgroup can potentially cause I/O deadlocks.",
+                                                   "optional" : 1,
+                                                   "type" : "boolean"
+                                                },
                                                 "keyctl" : {
                                                    "default" : 0,
                                                    "description" : "For unprivileged containers only: Allow the use of the keyctl() system call. This is required to use docker inside a container. By default unprivileged containers will see this system call as non-existent. This is mostly a workaround for systemd-networkd, as it will treat it as a fatal error when some keyctl() operations are denied by the kernel due to lacking permissions. Essentially, you can choose between running systemd-networkd or docker.",
@@ -19125,7 +19378,7 @@ var pveapi = [
                                              },
                                              "optional" : 1,
                                              "type" : "string",
-                                             "typetext" : "[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]"
+                                             "typetext" : "[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]"
                                           },
                                           "hostname" : {
                                              "description" : "Set a host name for the container.",
@@ -20383,8 +20636,54 @@ var pveapi = [
                                                 "proxyto" : null,
                                                 "returns" : {
                                                    "properties" : {
+                                                      "action" : {
+                                                         "type" : "string"
+                                                      },
+                                                      "comment" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "dest" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "dport" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "enable" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
+                                                      "iface" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "ipversion" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
+                                                      "macro" : {
+                                                         "optional" : 1,
+                                                         "type" : "integer"
+                                                      },
                                                       "pos" : {
                                                          "type" : "integer"
+                                                      },
+                                                      "proto" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "source" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "sport" : {
+                                                         "optional" : 1,
+                                                         "type" : "string"
+                                                      },
+                                                      "type" : {
+                                                         "type" : "string"
                                                       }
                                                    },
                                                    "type" : "object"
@@ -23602,6 +23901,12 @@ var pveapi = [
                               "features" : {
                                  "description" : "Allow containers access to advanced features.",
                                  "format" : {
+                                    "fuse" : {
+                                       "default" : 0,
+                                       "description" : "Allow using 'fuse' file systems in a container. Note that interactions between fuse and the freezer cgroup can potentially cause I/O deadlocks.",
+                                       "optional" : 1,
+                                       "type" : "boolean"
+                                    },
                                     "keyctl" : {
                                        "default" : 0,
                                        "description" : "For unprivileged containers only: Allow the use of the keyctl() system call. This is required to use docker inside a container. By default unprivileged containers will see this system call as non-existent. This is mostly a workaround for systemd-networkd, as it will treat it as a fatal error when some keyctl() operations are denied by the kernel due to lacking permissions. Essentially, you can choose between running systemd-networkd or docker.",
@@ -23624,7 +23929,7 @@ var pveapi = [
                                  },
                                  "optional" : 1,
                                  "type" : "string",
-                                 "typetext" : "[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]"
+                                 "typetext" : "[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]"
                               },
                               "force" : {
                                  "description" : "Allow to overwrite existing container.",
@@ -24267,6 +24572,293 @@ var pveapi = [
                         "path" : "/nodes/{node}/ceph/osd",
                         "text" : "osd"
                      },
+                     {
+                        "children" : [
+                           {
+                              "info" : {
+                                 "DELETE" : {
+                                    "description" : "Destroy Ceph Metadata Server",
+                                    "method" : "DELETE",
+                                    "name" : "destroymds",
+                                    "parameters" : {
+                                       "additionalProperties" : 0,
+                                       "properties" : {
+                                          "name" : {
+                                             "description" : "The name (ID) of the mds",
+                                             "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                             "type" : "string"
+                                          },
+                                          "node" : {
+                                             "description" : "The cluster node name.",
+                                             "format" : "pve-node",
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          }
+                                       }
+                                    },
+                                    "permissions" : {
+                                       "check" : [
+                                          "perm",
+                                          "/",
+                                          [
+                                             "Sys.Modify"
+                                          ]
+                                       ]
+                                    },
+                                    "protected" : 1,
+                                    "proxyto" : "node",
+                                    "returns" : {
+                                       "type" : "string"
+                                    }
+                                 },
+                                 "POST" : {
+                                    "description" : "Create Ceph Metadata Server (MDS)",
+                                    "method" : "POST",
+                                    "name" : "createmds",
+                                    "parameters" : {
+                                       "additionalProperties" : 0,
+                                       "properties" : {
+                                          "hotstandby" : {
+                                             "default" : "0",
+                                             "description" : "Determines whether a ceph-mds daemon should poll and replay the log of an active MDS. Faster switch on MDS failure, but needs more idle resources.",
+                                             "optional" : 1,
+                                             "type" : "boolean",
+                                             "typetext" : "<boolean>"
+                                          },
+                                          "name" : {
+                                             "default" : "nodename",
+                                             "description" : "The ID for the mds, when omitted the same as the nodename",
+                                             "optional" : 1,
+                                             "pattern" : "[a-zA-Z0-9]([a-zA-Z0-9\\-]*[a-zA-Z0-9])?",
+                                             "type" : "string"
+                                          },
+                                          "node" : {
+                                             "description" : "The cluster node name.",
+                                             "format" : "pve-node",
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          }
+                                       }
+                                    },
+                                    "permissions" : {
+                                       "check" : [
+                                          "perm",
+                                          "/",
+                                          [
+                                             "Sys.Modify"
+                                          ]
+                                       ]
+                                    },
+                                    "protected" : 1,
+                                    "proxyto" : "node",
+                                    "returns" : {
+                                       "type" : "string"
+                                    }
+                                 }
+                              },
+                              "leaf" : 1,
+                              "path" : "/nodes/{node}/ceph/mds/{name}",
+                              "text" : "{name}"
+                           }
+                        ],
+                        "info" : {
+                           "GET" : {
+                              "description" : "MDS directory index.",
+                              "method" : "GET",
+                              "name" : "index",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Audit",
+                                       "Datastore.Audit"
+                                    ],
+                                    "any",
+                                    1
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "items" : {
+                                    "properties" : {
+                                       "addr" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "host" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "name" : {
+                                          "description" : "The name (ID) for the MDS"
+                                       },
+                                       "rank" : {
+                                          "optional" : 1,
+                                          "type" : "integer"
+                                       },
+                                       "standby_replay" : {
+                                          "description" : "If true, the standby MDS is polling the active MDS for faster recovery (hot standby).",
+                                          "optional" : 1,
+                                          "type" : "boolean"
+                                       },
+                                       "state" : {
+                                          "description" : "State of the MDS",
+                                          "type" : "string"
+                                       }
+                                    },
+                                    "type" : "object"
+                                 },
+                                 "links" : [
+                                    {
+                                       "href" : "{name}",
+                                       "rel" : "child"
+                                    }
+                                 ],
+                                 "type" : "array"
+                              }
+                           }
+                        },
+                        "leaf" : 0,
+                        "path" : "/nodes/{node}/ceph/mds",
+                        "text" : "mds"
+                     },
+                     {
+                        "children" : [
+                           {
+                              "info" : {
+                                 "POST" : {
+                                    "description" : "Create a Ceph filesystem",
+                                    "method" : "POST",
+                                    "name" : "createfs",
+                                    "parameters" : {
+                                       "additionalProperties" : 0,
+                                       "properties" : {
+                                          "add-storage" : {
+                                             "default" : 0,
+                                             "description" : "Configure the created CephFS as storage for this cluster.",
+                                             "optional" : 1,
+                                             "type" : "boolean",
+                                             "typetext" : "<boolean>"
+                                          },
+                                          "name" : {
+                                             "default" : "cephfs",
+                                             "description" : "The ceph filesystem name.",
+                                             "optional" : 1,
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          },
+                                          "node" : {
+                                             "description" : "The cluster node name.",
+                                             "format" : "pve-node",
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          },
+                                          "pg_num" : {
+                                             "default" : 128,
+                                             "description" : "Number of placement groups for the backing data pool. The metadata pool will use a quarter of this.",
+                                             "maximum" : 32768,
+                                             "minimum" : 8,
+                                             "optional" : 1,
+                                             "type" : "integer",
+                                             "typetext" : "<integer> (8 - 32768)"
+                                          }
+                                       }
+                                    },
+                                    "permissions" : {
+                                       "check" : [
+                                          "perm",
+                                          "/",
+                                          [
+                                             "Sys.Modify"
+                                          ]
+                                       ]
+                                    },
+                                    "protected" : 1,
+                                    "proxyto" : "node",
+                                    "returns" : {
+                                       "type" : "string"
+                                    }
+                                 }
+                              },
+                              "leaf" : 1,
+                              "path" : "/nodes/{node}/ceph/fs/{name}",
+                              "text" : "{name}"
+                           }
+                        ],
+                        "info" : {
+                           "GET" : {
+                              "description" : "Directory index.",
+                              "method" : "GET",
+                              "name" : "index",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Audit",
+                                       "Datastore.Audit"
+                                    ],
+                                    "any",
+                                    1
+                                 ]
+                              },
+                              "protected" : 1,
+                              "returns" : {
+                                 "items" : {
+                                    "properties" : {
+                                       "data_pool" : {
+                                          "description" : "The name of the data pool.",
+                                          "type" : "string"
+                                       },
+                                       "metadata_pool" : {
+                                          "description" : "The name of the metadata pool.",
+                                          "type" : "string"
+                                       },
+                                       "name" : {
+                                          "description" : "The ceph filesystem name.",
+                                          "type" : "string"
+                                       }
+                                    },
+                                    "type" : "object"
+                                 },
+                                 "links" : [
+                                    {
+                                       "href" : "{name}",
+                                       "rel" : "child"
+                                    }
+                                 ],
+                                 "type" : "array"
+                              }
+                           }
+                        },
+                        "leaf" : 0,
+                        "path" : "/nodes/{node}/ceph/fs",
+                        "text" : "fs"
+                     },
                      {
                         "info" : {
                            "GET" : {
@@ -24554,6 +25146,15 @@ var pveapi = [
                               "parameters" : {
                                  "additionalProperties" : 0,
                                  "properties" : {
+                                    "cluster-network" : {
+                                       "description" : "Declare a separate cluster network, OSDs will routeheartbeat, object replication and recovery traffic over it",
+                                       "format" : "CIDR",
+                                       "maxLength" : 128,
+                                       "optional" : 1,
+                                       "requires" : "network",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },
                                     "disable_cephx" : {
                                        "default" : 0,
                                        "description" : "Disable cephx authentification.\n\nWARNING: cephx is a security feature protecting against man-in-the-middle attacks. Only consider disabling cephx if your network is private!",
@@ -24727,6 +25328,7 @@ var pveapi = [
                                        "typetext" : "<string>"
                                     },
                                     "service" : {
+                                       "default" : "ceph.target",
                                        "description" : "Ceph service name.",
                                        "optional" : 1,
                                        "pattern" : "(mon|mds|osd|mgr)\\.[A-Za-z0-9\\-]{1,32}",
@@ -24770,6 +25372,7 @@ var pveapi = [
                                        "typetext" : "<string>"
                                     },
                                     "service" : {
+                                       "default" : "ceph.target",
                                        "description" : "Ceph service name.",
                                        "optional" : 1,
                                        "pattern" : "(mon|mds|osd|mgr)\\.[A-Za-z0-9\\-]{1,32}",
@@ -24797,6 +25400,50 @@ var pveapi = [
                         "path" : "/nodes/{node}/ceph/start",
                         "text" : "start"
                      },
+                     {
+                        "info" : {
+                           "POST" : {
+                              "description" : "Restart ceph services.",
+                              "method" : "POST",
+                              "name" : "restart",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },
+                                    "service" : {
+                                       "default" : "ceph.target",
+                                       "description" : "Ceph service name.",
+                                       "optional" : 1,
+                                       "pattern" : "(mon|mds|osd|mgr)\\.[A-Za-z0-9\\-]{1,32}",
+                                       "type" : "string"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Modify"
+                                    ]
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "type" : "string"
+                              }
+                           }
+                        },
+                        "leaf" : 1,
+                        "path" : "/nodes/{node}/ceph/restart",
+                        "text" : "restart"
+                     },
                      {
                         "info" : {
                            "GET" : {
@@ -24958,7 +25605,7 @@ var pveapi = [
                                  "additionalProperties" : 0,
                                  "properties" : {
                                     "add_storages" : {
-                                       "description" : "Configure VM and CT storages using the new pool.",
+                                       "description" : "Configure VM and CT storage using the new pool.",
                                        "optional" : 1,
                                        "type" : "boolean",
                                        "typetext" : "<boolean>"
@@ -25000,7 +25647,7 @@ var pveapi = [
                                        "typetext" : "<string>"
                                     },
                                     "pg_num" : {
-                                       "default" : 64,
+                                       "default" : 128,
                                        "description" : "Number of placement groups.",
                                        "maximum" : 32768,
                                        "minimum" : 8,
@@ -27597,6 +28244,274 @@ var pveapi = [
                   "path" : "/nodes/{node}/scan",
                   "text" : "scan"
                },
+               {
+                  "children" : [
+                     {
+                        "children" : [
+                           {
+                              "children" : [
+                                 {
+                                    "info" : {
+                                       "GET" : {
+                                          "description" : "List mediated device types for given PCI device.",
+                                          "method" : "GET",
+                                          "name" : "mdevscan",
+                                          "parameters" : {
+                                             "additionalProperties" : 0,
+                                             "properties" : {
+                                                "node" : {
+                                                   "description" : "The cluster node name.",
+                                                   "format" : "pve-node",
+                                                   "type" : "string",
+                                                   "typetext" : "<string>"
+                                                },
+                                                "pciid" : {
+                                                   "description" : "The PCI ID to list the mdev types for.",
+                                                   "pattern" : "(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\\.[0-9a-fA-F]",
+                                                   "type" : "string"
+                                                }
+                                             }
+                                          },
+                                          "permissions" : {
+                                             "check" : [
+                                                "perm",
+                                                "/",
+                                                [
+                                                   "Sys.Modify"
+                                                ]
+                                             ]
+                                          },
+                                          "protected" : 1,
+                                          "proxyto" : "node",
+                                          "returns" : {
+                                             "items" : {
+                                                "properties" : {
+                                                   "available" : {
+                                                      "description" : "The number of still available instances of this type.",
+                                                      "type" : "integer"
+                                                   },
+                                                   "description" : {
+                                                      "type" : "string"
+                                                   },
+                                                   "type" : {
+                                                      "description" : "The name of the mdev type.",
+                                                      "type" : "string"
+                                                   }
+                                                },
+                                                "type" : "object"
+                                             },
+                                             "type" : "array"
+                                          }
+                                       }
+                                    },
+                                    "leaf" : 1,
+                                    "path" : "/nodes/{node}/hardware/pci/{pciid}/mdev",
+                                    "text" : "mdev"
+                                 }
+                              ],
+                              "info" : {
+                                 "GET" : {
+                                    "description" : "Index of available pci methods",
+                                    "method" : "GET",
+                                    "name" : "pciindex",
+                                    "parameters" : {
+                                       "additionalProperties" : 0,
+                                       "properties" : {
+                                          "node" : {
+                                             "description" : "The cluster node name.",
+                                             "format" : "pve-node",
+                                             "type" : "string",
+                                             "typetext" : "<string>"
+                                          },
+                                          "pciid" : {
+                                             "pattern" : "(?:[0-9a-fA-F]{4}:)?[0-9a-fA-F]{2}:[0-9a-fA-F]{2}\\.[0-9a-fA-F]",
+                                             "type" : "string"
+                                          }
+                                       }
+                                    },
+                                    "permissions" : {
+                                       "user" : "all"
+                                    },
+                                    "returns" : {
+                                       "items" : {
+                                          "properties" : {
+                                             "method" : {
+                                                "type" : "string"
+                                             }
+                                          },
+                                          "type" : "object"
+                                       },
+                                       "links" : [
+                                          {
+                                             "href" : "{method}",
+                                             "rel" : "child"
+                                          }
+                                       ],
+                                       "type" : "array"
+                                    }
+                                 }
+                              },
+                              "leaf" : 0,
+                              "path" : "/nodes/{node}/hardware/pci/{pciid}",
+                              "text" : "{pciid}"
+                           }
+                        ],
+                        "info" : {
+                           "GET" : {
+                              "description" : "List local PCI devices.",
+                              "method" : "GET",
+                              "name" : "pciscan",
+                              "parameters" : {
+                                 "additionalProperties" : 0,
+                                 "properties" : {
+                                    "node" : {
+                                       "description" : "The cluster node name.",
+                                       "format" : "pve-node",
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },
+                                    "pci-class-blacklist" : {
+                                       "default" : "05;06;08;0b",
+                                       "description" : "A list of blacklisted PCI classes, which will not be returned. Following are filtered by default: Memory Controller (05), Bridge (06), Generic System Peripheral (08) and Processor (0b).",
+                                       "format" : "string-list",
+                                       "optional" : 1,
+                                       "type" : "string",
+                                       "typetext" : "<string>"
+                                    },
+                                    "verbose" : {
+                                       "default" : 1,
+                                       "description" : "If disabled, does only print the PCI IDs. Otherwise, additional information like vendor and device will be returned.",
+                                       "optional" : 1,
+                                       "type" : "boolean",
+                                       "typetext" : "<boolean>"
+                                    }
+                                 }
+                              },
+                              "permissions" : {
+                                 "check" : [
+                                    "perm",
+                                    "/",
+                                    [
+                                       "Sys.Modify"
+                                    ]
+                                 ]
+                              },
+                              "protected" : 1,
+                              "proxyto" : "node",
+                              "returns" : {
+                                 "items" : {
+                                    "properties" : {
+                                       "class" : {
+                                          "description" : "The PCI Class of the device.",
+                                          "type" : "string"
+                                       },
+                                       "device" : {
+                                          "description" : "The Device ID.",
+                                          "type" : "string"
+                                       },
+                                       "device_name" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "id" : {
+                                          "description" : "The PCI ID.",
+                                          "type" : "string"
+                                       },
+                                       "iommugroup" : {
+                                          "description" : "The IOMMU group in which the device is in. If no IOMMU group is detected, it is set to -1.",
+                                          "type" : "integer"
+                                       },
+                                       "mdev" : {
+                                          "description" : "If set, marks that the device is capable of creating mediated devices.",
+                                          "optional" : 1,
+                                          "type" : "boolean"
+                                       },
+                                       "subsystem_device" : {
+                                          "description" : "The Subsystem Device ID.",
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "subsystem_device_name" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "subsystem_vendor" : {
+                                          "description" : "The Subsystem Vendor ID.",
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "subsystem_vendor_name" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       },
+                                       "vendor" : {
+                                          "description" : "The Vendor ID.",
+                                          "type" : "string"
+                                       },
+                                       "vendor_name" : {
+                                          "optional" : 1,
+                                          "type" : "string"
+                                       }
+                                    },
+                                    "type" : "object"
+                                 },
+                                 "links" : [
+                                    {
+                                       "href" : "{id}",
+                                       "rel" : "child"
+                                    }
+                                 ],
+                                 "type" : "array"
+                              }
+                           }
+                        },
+                        "leaf" : 0,
+                        "path" : "/nodes/{node}/hardware/pci",
+                        "text" : "pci"
+                     }
+                  ],
+                  "info" : {
+                     "GET" : {
+                        "description" : "Index of hardware types",
+                        "method" : "GET",
+                        "name" : "index",
+                        "parameters" : {
+                           "additionalProperties" : 0,
+                           "properties" : {
+                              "node" : {
+                                 "description" : "The cluster node name.",
+                                 "format" : "pve-node",
+                                 "type" : "string",
+                                 "typetext" : "<string>"
+                              }
+                           }
+                        },
+                        "permissions" : {
+                           "user" : "all"
+                        },
+                        "returns" : {
+                           "items" : {
+                              "properties" : {
+                                 "type" : {
+                                    "type" : "string"
+                                 }
+                              },
+                              "type" : "object"
+                           },
+                           "links" : [
+                              {
+                                 "href" : "{type}",
+                                 "rel" : "child"
+                              }
+                           ],
+                           "type" : "array"
+                        }
+                     }
+                  },
+                  "leaf" : 0,
+                  "path" : "/nodes/{node}/hardware",
+                  "text" : "hardware"
+               },
                {
                   "children" : [
                      {
@@ -28764,10 +29679,11 @@ var pveapi = [
                                              "type" : "string"
                                           },
                                           "children" : {
-                                             "description" : "The tree of the vdevs. Depending on the configuration of the zpool, they can be nested.",
+                                             "description" : "The pool configuration information, including the vdevs for each section (e.g. spares, cache), may be nested.",
                                              "items" : {
                                                 "properties" : {
                                                    "cksum" : {
+                                                      "optional" : 1,
                                                       "type" : "number"
                                                    },
                                                    "msg" : {
@@ -28775,17 +29691,20 @@ var pveapi = [
                                                       "type" : "string"
                                                    },
                                                    "name" : {
-                                                      "description" : "The name of the vdev.",
+                                                      "description" : "The name of the vdev or section.",
                                                       "type" : "string"
                                                    },
                                                    "read" : {
+                                                      "optional" : 1,
                                                       "type" : "number"
                                                    },
                                                    "state" : {
                                                       "description" : "The state of the vdev.",
+                                                      "optional" : 1,
                                                       "type" : "string"
                                                    },
                                                    "write" : {
+                                                      "optional" : 1,
                                                       "type" : "number"
                                                    }
                                                 },
@@ -28793,12 +29712,16 @@ var pveapi = [
                                              },
                                              "type" : "array"
                                           },
+                                          "errors" : {
+                                             "description" : "Information about the errors on the zpool.",
+                                             "type" : "string"
+                                          },
                                           "name" : {
                                              "description" : "The name of the zpool.",
                                              "type" : "string"
                                           },
                                           "scan" : {
-                                             "description" : "Information about the errors on the zpool.",
+                                             "description" : "Information about the last/current scrub.",
                                              "type" : "string"
                                           },
                                           "state" : {
@@ -29539,8 +30462,54 @@ var pveapi = [
                                     "proxyto" : "node",
                                     "returns" : {
                                        "properties" : {
+                                          "action" : {
+                                             "type" : "string"
+                                          },
+                                          "comment" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "dest" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "dport" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "enable" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
+                                          "iface" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "ipversion" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
+                                          "macro" : {
+                                             "optional" : 1,
+                                             "type" : "integer"
+                                          },
                                           "pos" : {
                                              "type" : "integer"
+                                          },
+                                          "proto" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "source" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "sport" : {
+                                             "optional" : 1,
+                                             "type" : "string"
+                                          },
+                                          "type" : {
+                                             "type" : "string"
                                           }
                                        },
                                        "type" : "object"
@@ -32522,7 +33491,7 @@ var pveapi = [
                            "typetext" : "<string>"
                         },
                         "krbd" : {
-                           "description" : "Access rbd through krbd kernel module.",
+                           "description" : "Always access rbd through krbd kernel module.",
                            "optional" : 1,
                            "type" : "boolean",
                            "typetext" : "<boolean>"
@@ -32718,6 +33687,7 @@ var pveapi = [
                         "cifs",
                         "dir",
                         "drbd",
+                        "fake",
                         "glusterfs",
                         "iscsi",
                         "iscsidirect",
@@ -32891,7 +33861,7 @@ var pveapi = [
                      "typetext" : "<string>"
                   },
                   "krbd" : {
-                     "description" : "Access rbd through krbd kernel module.",
+                     "description" : "Always access rbd through krbd kernel module.",
                      "optional" : 1,
                      "type" : "boolean",
                      "typetext" : "<boolean>"
@@ -33083,6 +34053,7 @@ var pveapi = [
                         "cifs",
                         "dir",
                         "drbd",
+                        "fake",
                         "glusterfs",
                         "iscsi",
                         "iscsidirect",
@@ -33212,13 +34183,19 @@ var pveapi = [
                                  "type" : "string"
                               },
                               "email" : {
+                                 "format" : "email-opt",
                                  "optional" : 1,
                                  "type" : "string"
                               },
                               "enable" : {
+                                 "default" : 1,
+                                 "description" : "Enable the account (default). You can set this to '0' to disable the account",
+                                 "optional" : 1,
                                  "type" : "boolean"
                               },
                               "expire" : {
+                                 "description" : "Account expiration date (seconds since epoch). '0' means no expiration date.",
+                                 "minimum" : 0,
                                  "optional" : 1,
                                  "type" : "integer"
                               },
@@ -33230,6 +34207,7 @@ var pveapi = [
                                  "type" : "array"
                               },
                               "keys" : {
+                                 "description" : "Keys for two factor auth (yubico).",
                                  "optional" : 1,
                                  "type" : "string"
                               },
@@ -33237,7 +34215,8 @@ var pveapi = [
                                  "optional" : 1,
                                  "type" : "string"
                               }
-                           }
+                           },
+                           "type" : "object"
                         }
                      },
                      "PUT" : {
@@ -33265,7 +34244,8 @@ var pveapi = [
                                  "typetext" : "<string>"
                               },
                               "enable" : {
-                                 "description" : "Enable/disable the account.",
+                                 "default" : 1,
+                                 "description" : "Enable the account (default). You can set this to '0' to disable the account",
                                  "optional" : 1,
                                  "type" : "boolean",
                                  "typetext" : "<boolean>"
@@ -33352,7 +34332,44 @@ var pveapi = [
                   "returns" : {
                      "items" : {
                         "properties" : {
+                           "comment" : {
+                              "optional" : 1,
+                              "type" : "string"
+                           },
+                           "email" : {
+                              "format" : "email-opt",
+                              "optional" : 1,
+                              "type" : "string"
+                           },
+                           "enable" : {
+                              "default" : 1,
+                              "description" : "Enable the account (default). You can set this to '0' to disable the account",
+                              "optional" : 1,
+                              "type" : "boolean"
+                           },
+                           "expire" : {
+                              "description" : "Account expiration date (seconds since epoch). '0' means no expiration date.",
+                              "minimum" : 0,
+                              "optional" : 1,
+                              "type" : "integer"
+                           },
+                           "firstname" : {
+                              "optional" : 1,
+                              "type" : "string"
+                           },
+                           "keys" : {
+                              "description" : "Keys for two factor auth (yubico).",
+                              "optional" : 1,
+                              "type" : "string"
+                           },
+                           "lastname" : {
+                              "optional" : 1,
+                              "type" : "string"
+                           },
                            "userid" : {
+                              "description" : "User ID",
+                              "format" : "pve-userid",
+                              "maxLength" : 64,
                               "type" : "string"
                            }
                         },
@@ -33387,7 +34404,7 @@ var pveapi = [
                         },
                         "enable" : {
                            "default" : 1,
-                           "description" : "Enable the account (default). You can set this to '0' to disable the accout",
+                           "description" : "Enable the account (default). You can set this to '0' to disable the account",
                            "optional" : 1,
                            "type" : "boolean",
                            "typetext" : "<boolean>"
@@ -33533,6 +34550,9 @@ var pveapi = [
                               },
                               "members" : {
                                  "items" : {
+                                    "description" : "User ID",
+                                    "format" : "pve-userid",
+                                    "maxLength" : 64,
                                     "type" : "string"
                                  },
                                  "type" : "array"
@@ -33595,7 +34615,12 @@ var pveapi = [
                   "returns" : {
                      "items" : {
                         "properties" : {
+                           "comment" : {
+                              "optional" : 1,
+                              "type" : "string"
+                           },
                            "groupid" : {
+                              "format" : "pve-groupid",
                               "type" : "string"
                            }
                         },
@@ -33697,10 +34722,143 @@ var pveapi = [
                         "permissions" : {
                            "user" : "all"
                         },
-                        "returns" : {}
+                        "returns" : {
+                           "additionalProperties" : 0,
+                           "properties" : {
+                              "Datastore.Allocate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Datastore.AllocateSpace" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Datastore.AllocateTemplate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Datastore.Audit" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Group.Allocate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Permissions.Modify" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Pool.Allocate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Realm.Allocate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Realm.AllocateUser" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Sys.Audit" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Sys.Console" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Sys.Modify" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Sys.PowerMgmt" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "Sys.Syslog" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "User.Modify" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Allocate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Audit" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Backup" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Clone" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.CDROM" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.CPU" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.Disk" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.HWType" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.Memory" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.Network" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Config.Options" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Console" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Migrate" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Monitor" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.PowerMgmt" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Snapshot" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              },
+                              "VM.Snapshot.Rollback" : {
+                                 "optional" : 1,
+                                 "type" : "boolean"
+                              }
+                           },
+                           "type" : "object"
+                        }
                      },
                      "PUT" : {
-                        "description" : "Create new role.",
+                        "description" : "Update an existing role.",
                         "method" : "PUT",
                         "name" : "update_role",
                         "parameters" : {
@@ -33714,6 +34872,7 @@ var pveapi = [
                               },
                               "privs" : {
                                  "format" : "pve-priv-list",
+                                 "optional" : 1,
                                  "type" : "string",
                                  "typetext" : "<string>"
                               },
@@ -33758,8 +34917,19 @@ var pveapi = [
                   "returns" : {
                      "items" : {
                         "properties" : {
+                           "privs" : {
+                              "format" : "pve-priv-list",
+                              "optional" : 1,
+                              "type" : "string"
+                           },
                            "roleid" : {
+                              "format" : "pve-roleid",
                               "type" : "string"
+                           },
+                           "special" : {
+                              "default" : 0,
+                              "optional" : 1,
+                              "type" : "boolean"
                            }
                         },
                         "type" : "object"
@@ -33830,9 +35000,13 @@ var pveapi = [
                         "additionalProperties" : 0,
                         "properties" : {
                            "path" : {
+                              "description" : "Access control path",
                               "type" : "string"
                            },
                            "propagate" : {
+                              "default" : 1,
+                              "description" : "Allow to propagate (inherit) permissions.",
+                              "optional" : 1,
                               "type" : "boolean"
                            },
                            "roleid" : {
@@ -34411,6 +35585,10 @@ var pveapi = [
                            "optional" : 1,
                            "type" : "string"
                         },
+                        "clustername" : {
+                           "optional" : 1,
+                           "type" : "string"
+                        },
                         "ticket" : {
                            "optional" : 1,
                            "type" : "string"
@@ -34432,7 +35610,7 @@ var pveapi = [
                "PUT" : {
                   "description" : "Change user password.",
                   "method" : "PUT",
-                  "name" : "change_passsword",
+                  "name" : "change_password",
                   "parameters" : {
                      "additionalProperties" : 0,
                      "properties" : {
index bf60d9539e532cfe5c6379ac3a20918e3b469966..433a1c1ae73bf70e6ff179d7f1d4dfb6888df0b5 100644 (file)
@@ -112,7 +112,7 @@ NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 Container description. Only used on the configuration web interface.
 
-`--features` `[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
+`--features` `[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
 
 Allow containers access to advanced features.
 
@@ -426,6 +426,18 @@ File permissions to use (octal by default, prefix with '0x' for hexadecimal).
 
 Owner user name or id. When using a name it must exist inside the container.
 
+*pct rescan* `[OPTIONS]`
+
+Rescan all storages and update disk sizes and unused disk images.
+
+`--dryrun` `<boolean>` ('default =' `0`)::
+
+Do not actually write changes out to conifg.
+
+`--vmid` `<integer> (1 - N)` ::
+
+The (unique) ID of the VM.
+
 *pct resize* `<vmid> <disk> <size>` `[OPTIONS]`
 
 Resize a container mount point.
@@ -494,7 +506,7 @@ NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 Container description. Only used on the configuration web interface.
 
-`--features` `[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
+`--features` `[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
 
 Allow containers access to advanced features.
 
@@ -662,7 +674,7 @@ Container description. Only used on the configuration web interface.
 
 Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.
 
-`--features` `[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
+`--features` `[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
 
 Allow containers access to advanced features.
 
index 7256f5a16401fc2c614836c3defab0586df3688e..4024154ecaa1c51e0aefdfc2d4586ea52333074f 100644 (file)
@@ -30,10 +30,14 @@ NOTE: You can disable fair-scheduler configuration by setting this to 0.
 
 Container description. Only used on the configuration web interface.
 
-`features`: `[keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
+`features`: `[fuse=<1|0>] [,keyctl=<1|0>] [,mount=<fstype;fstype;...>] [,nesting=<1|0>]` ::
 
 Allow containers access to advanced features.
 
+`fuse`=`<boolean>` ('default =' `0`);;
+
+Allow using 'fuse' file systems in a container. Note that interactions between fuse and the freezer cgroup can potentially cause I/O deadlocks.
+
 `keyctl`=`<boolean>` ('default =' `0`);;
 
 For unprivileged containers only: Allow the use of the keyctl() system call. This is required to use docker inside a container. By default unprivileged containers will see this system call as non-existent. This is mostly a workaround for systemd-networkd, as it will treat it as a fatal error when some keyctl() operations are denied by the kernel due to lacking permissions. Essentially, you can choose between running systemd-networkd or docker.
index 472011778ca8d54ef5fc259890634d6d457cb66b..8252e805a9b6e3b56f953bdc3a13c311457a4b79 100644 (file)
 *pveceph* `<COMMAND> [ARGS] [OPTIONS]`
 
-*pveceph createmgr* `[OPTIONS]`
+*pveceph createmgr*
 
-Create Ceph Manager
+An alias for 'pveceph mgr create'.
 
-`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+*pveceph createmon*
 
-The ID for the manager, when omitted the same as the nodename
+An alias for 'pveceph mon create'.
 
-*pveceph createmon* `[OPTIONS]`
+*pveceph createosd*
 
-Create Ceph Monitor and Manager
+An alias for 'pveceph osd create'.
 
-`--exclude-manager` `<boolean>` ('default =' `0`)::
+*pveceph createpool*
 
-When set, only a monitor will be created.
+An alias for 'pveceph pool create'.
 
-`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+*pveceph destroymgr*
 
-The ID for the monitor, when omitted the same as the nodename
+An alias for 'pveceph mgr destroy'.
 
-`--mon-address` `<string>` ::
+*pveceph destroymon*
 
-Overwrites autodetected monitor IP address. Must be in the public network of ceph.
+An alias for 'pveceph mon destroy'.
 
-*pveceph createosd* `<dev>` `[OPTIONS]`
+*pveceph destroyosd*
 
-Create OSD
+An alias for 'pveceph osd destroy'.
 
-`<dev>`: `<string>` ::
+*pveceph destroypool*
 
-Block device name.
+An alias for 'pveceph pool destroy'.
 
-`--bluestore` `<boolean>` ('default =' `1`)::
+*pveceph fs create* `[OPTIONS]`
 
-Use bluestore instead of filestore. This is the default.
+Create a Ceph filesystem
 
-`--fstype` `<ext4 | xfs>` ('default =' `xfs`)::
+`--add-storage` `<boolean>` ('default =' `0`)::
 
-File system type (filestore only).
+Configure the created CephFS as storage for this cluster.
 
-`--journal_dev` `<string>` ::
+`--name` `<string>` ('default =' `cephfs`)::
 
-Block device name for journal (filestore) or block.db (bluestore).
+The ceph filesystem name.
 
-`--wal_dev` `<string>` ::
+`--pg_num` `<integer> (8 - 32768)` ('default =' `128`)::
 
-Block device name for block.wal (bluestore only).
+Number of placement groups for the backing data pool. The metadata pool will use a quarter of this.
 
-*pveceph createpool* `<name>` `[OPTIONS]`
+*pveceph help* `[OPTIONS]`
 
-Create POOL
+Get help about specified command.
 
-`<name>`: `<string>` ::
+`--extra-args` `<array>` ::
 
-The name of the pool. It must be unique.
+Shows help for a specific command
 
-`--add_storages` `<boolean>` ::
+`--verbose` `<boolean>` ::
 
-Configure VM and CT storages using the new pool.
+Verbose output format.
 
-`--application` `<cephfs | rbd | rgw>` ::
+*pveceph init* `[OPTIONS]`
 
-The application of the pool, 'rbd' by default.
+Create initial ceph default configuration and setup symlinks.
 
-`--crush_rule` `<string>` ::
+`--cluster-network` `<string>` ::
 
-The rule to use for mapping object placement in the cluster.
+Declare a separate cluster network, OSDs will routeheartbeat, object replication and recovery traffic over it
++
+NOTE: Requires option(s): `network`
+
+`--disable_cephx` `<boolean>` ('default =' `0`)::
+
+Disable cephx authentification.
++
+WARNING: cephx is a security feature protecting against man-in-the-middle attacks. Only consider disabling cephx if your network is private!
 
 `--min_size` `<integer> (1 - 7)` ('default =' `2`)::
 
-Minimum number of replicas per object
+Minimum number of available replicas per object to allow I/O
 
-`--pg_num` `<integer> (8 - 32768)` ('default =' `64`)::
+`--network` `<string>` ::
 
-Number of placement groups.
+Use specific network for all ceph related traffic
+
+`--pg_bits` `<integer> (6 - 14)` ('default =' `6`)::
+
+Placement group bits, used to specify the default number of placement groups.
++
+NOTE: 'osd pool default pg num' does not work for default pools.
 
 `--size` `<integer> (1 - 7)` ('default =' `3`)::
 
-Number of replicas per object
+Targeted number of replicas per object
+
+*pveceph install* `[OPTIONS]`
+
+Install ceph related packages.
+
+`--version` `<luminous>` ::
+
+no description available
+
+*pveceph lspools*
+
+An alias for 'pveceph pool ls'.
 
-*pveceph destroymgr* `<id>`
+*pveceph mds create* `[OPTIONS]`
+
+Create Ceph Metadata Server (MDS)
+
+`--hotstandby` `<boolean>` ('default =' `0`)::
+
+Determines whether a ceph-mds daemon should poll and replay the log of an active MDS. Faster switch on MDS failure, but needs more idle resources.
+
+`--name` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ('default =' `nodename`)::
+
+The ID for the mds, when omitted the same as the nodename
+
+*pveceph mds destroy* `<name>`
+
+Destroy Ceph Metadata Server
+
+`<name>`: `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The name (ID) of the mds
+
+*pveceph mgr create* `[OPTIONS]`
+
+Create Ceph Manager
+
+`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The ID for the manager, when omitted the same as the nodename
+
+*pveceph mgr destroy* `<id>`
 
 Destroy Ceph Manager.
 
@@ -88,7 +142,23 @@ Destroy Ceph Manager.
 
 The ID of the manager
 
-*pveceph destroymon* `<monid>` `[OPTIONS]`
+*pveceph mon create* `[OPTIONS]`
+
+Create Ceph Monitor and Manager
+
+`--exclude-manager` `<boolean>` ('default =' `0`)::
+
+When set, only a monitor will be created.
+
+`--id` `[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?` ::
+
+The ID for the monitor, when omitted the same as the nodename
+
+`--mon-address` `<string>` ::
+
+Overwrites autodetected monitor IP address. Must be in the public network of ceph.
+
+*pveceph mon destroy* `<monid>` `[OPTIONS]`
 
 Destroy Ceph Monitor and Manager.
 
@@ -100,83 +170,91 @@ Monitor ID
 
 When set, removes only the monitor, not the manager
 
-*pveceph destroyosd* `<osdid>` `[OPTIONS]`
+*pveceph osd create* `<dev>` `[OPTIONS]`
 
-Destroy OSD
+Create OSD
 
-`<osdid>`: `<integer>` ::
+`<dev>`: `<string>` ::
 
-OSD ID
+Block device name.
 
-`--cleanup` `<boolean>` ('default =' `0`)::
+`--bluestore` `<boolean>` ('default =' `1`)::
 
-If set, we remove partition table entries.
+Use bluestore instead of filestore. This is the default.
 
-*pveceph destroypool* `<name>` `[OPTIONS]`
+`--fstype` `<ext4 | xfs>` ('default =' `xfs`)::
 
-Destroy pool
+File system type (filestore only).
 
-`<name>`: `<string>` ::
+`--journal_dev` `<string>` ::
 
-The name of the pool. It must be unique.
+Block device name for journal (filestore) or block.db (bluestore).
 
-`--force` `<boolean>` ('default =' `0`)::
+`--wal_dev` `<string>` ::
 
-If true, destroys pool even if in use
+Block device name for block.wal (bluestore only).
 
-`--remove_storages` `<boolean>` ('default =' `0`)::
+*pveceph osd destroy* `<osdid>` `[OPTIONS]`
 
-Remove all pveceph-managed storages configured for this pool
+Destroy OSD
 
-*pveceph help* `[OPTIONS]`
+`<osdid>`: `<integer>` ::
 
-Get help about specified command.
+OSD ID
 
-`--extra-args` `<array>` ::
+`--cleanup` `<boolean>` ('default =' `0`)::
 
-Shows help for a specific command
+If set, we remove partition table entries.
 
-`--verbose` `<boolean>` ::
+*pveceph pool create* `<name>` `[OPTIONS]`
 
-Verbose output format.
+Create POOL
 
-*pveceph init* `[OPTIONS]`
+`<name>`: `<string>` ::
 
-Create initial ceph default configuration and setup symlinks.
+The name of the pool. It must be unique.
 
-`--disable_cephx` `<boolean>` ('default =' `0`)::
+`--add_storages` `<boolean>` ::
 
-Disable cephx authentification.
-+
-WARNING: cephx is a security feature protecting against man-in-the-middle attacks. Only consider disabling cephx if your network is private!
+Configure VM and CT storage using the new pool.
 
-`--min_size` `<integer> (1 - 7)` ('default =' `2`)::
+`--application` `<cephfs | rbd | rgw>` ::
 
-Minimum number of available replicas per object to allow I/O
+The application of the pool, 'rbd' by default.
 
-`--network` `<string>` ::
+`--crush_rule` `<string>` ::
 
-Use specific network for all ceph related traffic
+The rule to use for mapping object placement in the cluster.
 
-`--pg_bits` `<integer> (6 - 14)` ('default =' `6`)::
+`--min_size` `<integer> (1 - 7)` ('default =' `2`)::
 
-Placement group bits, used to specify the default number of placement groups.
-+
-NOTE: 'osd pool default pg num' does not work for default pools.
+Minimum number of replicas per object
+
+`--pg_num` `<integer> (8 - 32768)` ('default =' `128`)::
+
+Number of placement groups.
 
 `--size` `<integer> (1 - 7)` ('default =' `3`)::
 
-Targeted number of replicas per object
+Number of replicas per object
 
-*pveceph install* `[OPTIONS]`
+*pveceph pool destroy* `<name>` `[OPTIONS]`
 
-Install ceph related packages.
+Destroy pool
 
-`--version` `<luminous>` ::
+`<name>`: `<string>` ::
 
-no description available
+The name of the pool. It must be unique.
 
-*pveceph lspools*
+`--force` `<boolean>` ('default =' `0`)::
+
+If true, destroys pool even if in use
+
+`--remove_storages` `<boolean>` ('default =' `0`)::
+
+Remove all pveceph-managed storages configured for this pool
+
+*pveceph pool ls*
 
 List all pools.
 
@@ -188,7 +266,7 @@ Destroy ceph related data and configuration files.
 
 Start ceph services.
 
-`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ::
+`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ('default =' `ceph.target`)::
 
 Ceph service name.
 
@@ -200,7 +278,7 @@ Get ceph status.
 
 Stop ceph services.
 
-`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ::
+`<service>`: `(mon|mds|osd|mgr)\.[A-Za-z0-9\-]{1,32}` ('default =' `ceph.target`)::
 
 Ceph service name.
 
index cbf32fa2069dfcd59411d580cf71aa6d88ad0ca1..27f561f12aa8392ead46cbb3648e40201040f4b7 100644 (file)
@@ -38,7 +38,7 @@ Number of votes for this node
 
 *pvecm addnode* `<node>` `[OPTIONS]`
 
-Adds a node to the cluster configuration.
+Adds a node to the cluster configuration. This call is for internal use.
 
 `<node>`: `<string>` ::
 
index 9c5e61499579235cb0945ad94917564981c6d7fa..5a71906311410773811026056d8fab464ad89d78 100644 (file)
@@ -4,7 +4,7 @@
 
 Create a new storage.
 
-`<type>`: `<cephfs | cifs | dir | drbd | glusterfs | iscsi | iscsidirect | lvm | lvmthin | nfs | rbd | sheepdog | zfs | zfspool>` ::
+`<type>`: `<cephfs | cifs | dir | drbd | fake | glusterfs | iscsi | iscsidirect | lvm | lvmthin | nfs | rbd | sheepdog | zfs | zfspool>` ::
 
 Storage type.
 
@@ -72,7 +72,7 @@ iscsi provider
 
 `--krbd` `<boolean>` ::
 
-Access rbd through krbd kernel module.
+Always access rbd through krbd kernel module.
 
 `--lio_tpg` `<string>` ::
 
@@ -214,25 +214,9 @@ no description available
 +
 NOTE: Requires option(s): `size`
 
-*pvesm cifsscan* `<server>` `[OPTIONS]`
+*pvesm cifsscan*
 
-Scan remote CIFS server.
-
-`<server>`: `<string>` ::
-
-The server address (name or IP).
-
-`--domain` `<string>` ::
-
-SMB domain (Workgroup).
-
-`--password` `<password>` ::
-
-User password.
-
-`--username` `<string>` ::
-
-User name.
+An alias for 'pvesm scan cifs'.
 
 *pvesm export* `<volume> <format> <filename>` `[OPTIONS]`
 
@@ -282,13 +266,9 @@ Volume identifier
 
 The storage identifier.
 
-*pvesm glusterfsscan* `<server>`
+*pvesm glusterfsscan*
 
-Scan remote GlusterFS server.
-
-`<server>`: `<string>` ::
-
-The server address (name or IP).
+An alias for 'pvesm scan glusterfs'.
 
 *pvesm help* `[OPTIONS]`
 
@@ -330,13 +310,9 @@ A snapshot to delete on success
 
 Whether the stream includes intermediate snapshots
 
-*pvesm iscsiscan* `<portal>`
-
-Scan remote iSCSI server.
-
-`<portal>`: `<string>` ::
+*pvesm iscsiscan*
 
-The iSCSI portal (IP or DNS name with optional port).
+An alias for 'pvesm scan iscsi'.
 
 *pvesm list* `<storage>` `[OPTIONS]`
 
@@ -356,23 +332,15 @@ Only list images for this VM
 
 *pvesm lvmscan*
 
-List local LVM volume groups.
-
-*pvesm lvmthinscan* `<vg>`
+An alias for 'pvesm scan lvm'.
 
-List local LVM Thin Pools.
-
-`<vg>`: `[a-zA-Z0-9\.\+\_][a-zA-Z0-9\.\+\_\-]+` ::
+*pvesm lvmthinscan*
 
-no description available
+An alias for 'pvesm scan lvmthin'.
 
-*pvesm nfsscan* `<server>`
+*pvesm nfsscan*
 
-Scan remote NFS server.
-
-`<server>`: `<string>` ::
-
-The server address (name or IP).
+An alias for 'pvesm scan nfs'.
 
 *pvesm path* `<volume>`
 
@@ -390,6 +358,66 @@ Delete storage configuration.
 
 The storage identifier.
 
+*pvesm scan cifs* `<server>` `[OPTIONS]`
+
+Scan remote CIFS server.
+
+`<server>`: `<string>` ::
+
+The server address (name or IP).
+
+`--domain` `<string>` ::
+
+SMB domain (Workgroup).
+
+`--password` `<password>` ::
+
+User password.
+
+`--username` `<string>` ::
+
+User name.
+
+*pvesm scan glusterfs* `<server>`
+
+Scan remote GlusterFS server.
+
+`<server>`: `<string>` ::
+
+The server address (name or IP).
+
+*pvesm scan iscsi* `<portal>`
+
+Scan remote iSCSI server.
+
+`<portal>`: `<string>` ::
+
+The iSCSI portal (IP or DNS name with optional port).
+
+*pvesm scan lvm*
+
+List local LVM volume groups.
+
+*pvesm scan lvmthin* `<vg>`
+
+List local LVM Thin Pools.
+
+`<vg>`: `[a-zA-Z0-9\.\+\_][a-zA-Z0-9\.\+\_\-]+` ::
+
+no description available
+
+*pvesm scan nfs* `<server>`
+
+Scan remote NFS server.
+
+`<server>`: `<string>` ::
+
+The server address (name or IP).
+
+*pvesm scan zfs*
+
+Scan zfs pool list on local node.
+
 *pvesm set* `<storage>` `[OPTIONS]`
 
 Update storage configuration.
@@ -450,7 +478,7 @@ Assume the given path is an externally managed mountpoint and consider the stora
 
 `--krbd` `<boolean>` ::
 
-Access rbd through krbd kernel module.
+Always access rbd through krbd kernel module.
 
 `--lio_tpg` `<string>` ::
 
@@ -564,6 +592,6 @@ If target is different to 'node', we only lists shared storages which content is
 
 *pvesm zfsscan*
 
-Scan zfs pool list on local node.
+An alias for 'pvesm scan zfs'.
 
 
index 865c98362b61f5338d44139c30830177a52537e6..6f0d58b09b9278c5a446ec4d3ec9180184f0349a 100644 (file)
@@ -1,6 +1,6 @@
 *pveum* `<COMMAND> [ARGS] [OPTIONS]`
 
-*pveum acldel* `<path> --roles <string>` `[OPTIONS]`
+*pveum acl delete* `<path> --roles <string>` `[OPTIONS]`
 
 Update Access Control List (add or remove permissions).
 
@@ -24,7 +24,7 @@ List of roles.
 
 List of users.
 
-*pveum aclmod* `<path> --roles <string>` `[OPTIONS]`
+*pveum acl modify* `<path> --roles <string>` `[OPTIONS]`
 
 Update Access Control List (add or remove permissions).
 
@@ -48,7 +48,15 @@ List of roles.
 
 List of users.
 
-*pveum groupadd* `<groupid>` `[OPTIONS]`
+*pveum acldel*
+
+An alias for 'pveum acl delete'.
+
+*pveum aclmod*
+
+An alias for 'pveum acl modify'.
+
+*pveum group add* `<groupid>` `[OPTIONS]`
 
 Create new group.
 
@@ -60,7 +68,7 @@ no description available
 
 no description available
 
-*pveum groupdel* `<groupid>`
+*pveum group delete* `<groupid>`
 
 Delete group.
 
@@ -68,7 +76,7 @@ Delete group.
 
 no description available
 
-*pveum groupmod* `<groupid>` `[OPTIONS]`
+*pveum group modify* `<groupid>` `[OPTIONS]`
 
 Update group data.
 
@@ -80,6 +88,18 @@ no description available
 
 no description available
 
+*pveum groupadd*
+
+An alias for 'pveum group add'.
+
+*pveum groupdel*
+
+An alias for 'pveum group delete'.
+
+*pveum groupmod*
+
+An alias for 'pveum group modify'.
+
 *pveum help* `[OPTIONS]`
 
 Get help about specified command.
@@ -100,7 +120,7 @@ Change user password.
 
 User ID
 
-*pveum roleadd* `<roleid>` `[OPTIONS]`
+*pveum role add* `<roleid>` `[OPTIONS]`
 
 Create new role.
 
@@ -112,7 +132,7 @@ no description available
 
 no description available
 
-*pveum roledel* `<roleid>`
+*pveum role delete* `<roleid>`
 
 Delete role.
 
@@ -120,9 +140,9 @@ Delete role.
 
 no description available
 
-*pveum rolemod* `<roleid> --privs <string>` `[OPTIONS]`
+*pveum role modify* `<roleid>` `[OPTIONS]`
 
-Create new role.
+Update an existing role.
 
 `<roleid>`: `<string>` ::
 
@@ -138,6 +158,18 @@ NOTE: Requires option(s): `privs`
 
 no description available
 
+*pveum roleadd*
+
+An alias for 'pveum role add'.
+
+*pveum roledel*
+
+An alias for 'pveum role delete'.
+
+*pveum rolemod*
+
+An alias for 'pveum role modify'.
+
 *pveum ticket* `<username>` `[OPTIONS]`
 
 Create or verify authentication ticket.
@@ -166,7 +198,7 @@ NOTE: Requires option(s): `path`
 
 You can optionally pass the realm using this parameter. Normally the realm is simply added to the username <username>@<relam>.
 
-*pveum useradd* `<userid>` `[OPTIONS]`
+*pveum user add* `<userid>` `[OPTIONS]`
 
 Create new user.
 
@@ -184,7 +216,7 @@ no description available
 
 `--enable` `<boolean>` ('default =' `1`)::
 
-Enable the account (default). You can set this to '0' to disable the accout
+Enable the account (default). You can set this to '0' to disable the account
 
 `--expire` `<integer> (0 - N)` ::
 
@@ -206,11 +238,11 @@ Keys for two factor auth (yubico).
 
 no description available
 
-`--password` `<password>` ::
+`--password` `<string>` ::
 
 Initial password.
 
-*pveum userdel* `<userid>`
+*pveum user delete* `<userid>`
 
 Delete user.
 
@@ -218,7 +250,7 @@ Delete user.
 
 User ID
 
-*pveum usermod* `<userid>` `[OPTIONS]`
+*pveum user modify* `<userid>` `[OPTIONS]`
 
 Update user configuration.
 
@@ -240,9 +272,9 @@ no description available
 
 no description available
 
-`--enable` `<boolean>` ::
+`--enable` `<boolean>` ('default =' `1`)::
 
-Enable/disable the account.
+Enable the account (default). You can set this to '0' to disable the account
 
 `--expire` `<integer> (0 - N)` ::
 
@@ -264,4 +296,16 @@ Keys for two factor auth (yubico).
 
 no description available
 
+*pveum useradd*
+
+An alias for 'pveum user add'.
+
+*pveum userdel*
+
+An alias for 'pveum user delete'.
+
+*pveum usermod*
+
+An alias for 'pveum user modify'.
+
 
index 67b2edd8f0c44e67561fa7e459acd3a035a96c15..705a8c507c6d2d86be24be46fedf54f859a37c3a 100644 (file)
@@ -17,7 +17,7 @@ Specify IP addresses and gateways for the corresponding interface.
 IP addresses use CIDR notation, gateways are optional but need an IP of the same type specified.
 +
 The special string 'dhcp' can be used for IP addresses to use DHCP, in which case no explicit gateway should be provided.
-SLAAC is not supported by cloud-init but at least netplan activates SLAAC when selecting 'dhcp' so it should work with up-to-date netplan versions.
+For IPv6 the special string 'auto' can be used to use stateless autoconfiguration.
 +
 If cloud-init is enabled and neither an IPv4 nor an IPv6 address is specified, it defaults to using dhcp on IPv4.
 
index dbbbd8d0bfe2c69c557cb446822f12eddc2aecbb..4580d1d4c93802c645e83c14830c89056d4a0bfa 100644 (file)
@@ -4,6 +4,23 @@
 
 An alias for 'qm guest cmd'.
 
+*qm cleanup* `<vmid> <clean-shutdown> <guest-requested>`
+
+Cleans up resources like tap devices, vgpus, etc. Called after a vm shuts
+down, crashes, etc.
+
+`<vmid>`: `<integer> (1 - N)` ::
+
+The (unique) ID of the VM.
+
+`<clean-shutdown>`: `<boolean>` ::
+
+Indicates if qemu shutdown cleanly.
+
+`<guest-requested>`: `<boolean>` ::
+
+Indicates if the shutdown was requested by the guest or via qmp.
+
 *qm clone* `<vmid> <newid>` `[OPTIONS]`
 
 Create a copy of virtual machine/template.
@@ -77,6 +94,10 @@ Enable/disable ACPI.
 
 Enable/disable Qemu GuestAgent and its properties.
 
+`--arch` `<aarch64 | x86_64>` ::
+
+Virtual processor architecture. Defaults to the host.
+
 `--archive` `<string>` ::
 
 The backup file.
@@ -159,7 +180,7 @@ NOTE: Requires option(s): `archive`
 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 
-`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
+`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
 
 Map host PCI devices into guest.
 
@@ -202,7 +223,7 @@ Set the real time clock to local time. This is enabled by default if ostype indi
 
 Lock/unlock the VM.
 
-`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?|virt(?:-\d+\.\d+)?)` ::
 
 Specifies the Qemu machine type.
 
@@ -348,9 +369,9 @@ Configure an USB device (n is 0 to 4).
 
 Number of hotplugged vcpus.
 
-`--vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | virtio | vmware>` ::
+`--vga` `[[type=]<enum>] [,memory=<integer>]` ::
 
-Select the VGA type.
+Configure the VGA hardware.
 
 `--virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,shared=<1|0>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
 
@@ -731,6 +752,10 @@ Enable/disable ACPI.
 
 Enable/disable Qemu GuestAgent and its properties.
 
+`--arch` `<aarch64 | x86_64>` ::
+
+Virtual processor architecture. Defaults to the host.
+
 `--args` `<string>` ::
 
 Arbitrary arguments passed to kvm.
@@ -813,7 +838,7 @@ NOTE: Requires option(s): `delete`
 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 
-`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
+`--hostpci[n]` `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
 
 Map host PCI devices into guest.
 
@@ -856,7 +881,7 @@ Set the real time clock to local time. This is enabled by default if ostype indi
 
 Lock/unlock the VM.
 
-`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?|virt(?:-\d+\.\d+)?)` ::
 
 Specifies the Qemu machine type.
 
@@ -992,9 +1017,9 @@ Configure an USB device (n is 0 to 4).
 
 Number of hotplugged vcpus.
 
-`--vga` `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | virtio | vmware>` ::
+`--vga` `[[type=]<enum>] [,memory=<integer>]` ::
 
-Select the VGA type.
+Configure the VGA hardware.
 
 `--virtio[n]` `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,shared=<1|0>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::
 
@@ -1078,7 +1103,7 @@ Start virtual machine.
 
 The (unique) ID of the VM.
 
-`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`--machine` `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?|virt(?:-\d+\.\d+)?)` ::
 
 Specifies the Qemu machine type.
 
index d5b1b92040fcc170b449b8535016224176977d5c..80b660c814b90b2937419d02bfb34a9dd50c692f 100644 (file)
@@ -14,6 +14,10 @@ Enable/disable Qemu GuestAgent.
 
 Run fstrim after cloning/moving a disk.
 
+`arch`: `<aarch64 | x86_64>` ::
+
+Virtual processor architecture. Defaults to the host.
+
 `args`: `<string>` ::
 
 Arbitrary arguments passed to kvm, for example:
@@ -112,7 +116,7 @@ Disk size. This is purely informational and has no effect.
 
 Freeze CPU at startup (use 'c' monitor command to start execution).
 
-`hostpci[n]`: `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
+`hostpci[n]`: `[host=]<HOSTPCIID[;HOSTPCIID2...]> [,mdev=<string>] [,pcie=<1|0>] [,rombar=<1|0>] [,romfile=<string>] [,x-vga=<1|0>]` ::
 
 Map host PCI devices into guest.
 +
@@ -130,6 +134,12 @@ of PCI virtual functions of the host. HOSTPCIID syntax is:
 +
 You can us the 'lspci' command to list existing PCI devices.
 
+`mdev`=`<string>` ;;
+
+The type of mediated device to use.
+An instance of this type will be created on startup of the VM and
+will be cleaned up when the VM stops.
+
 `pcie`=`<boolean>` ('default =' `0`);;
 
 Choose the PCI-express bus (needs the 'q35' machine model).
@@ -375,7 +385,7 @@ Set the real time clock to local time. This is enabled by default if ostype indi
 
 Lock/unlock the VM.
 
-`machine`: `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?)` ::
+`machine`: `(pc|pc(-i440fx)?-\d+\.\d+(\.pxe)?|q35|pc-q35-\d+\.\d+(\.pxe)?|virt(?:-\d+\.\d+)?)` ::
 
 Specifies the Qemu machine type.
 
@@ -983,9 +993,18 @@ Specifies whether if given host option is a USB3 device or port (this does curre
 
 Number of hotplugged vcpus.
 
-`vga`: `<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | virtio | vmware>` ::
+`vga`: `[[type=]<enum>] [,memory=<integer>]` ::
+
+Configure the VGA Hardware. If you want to use high resolution modes (>= 1280x1024x16) you may need to increase the vga memory option. Since QEMU 2.9 the default VGA display type is 'std' for all OS types besides some Windows versions (XP and older) which use 'cirrus'. The 'qxl' option enables the SPICE display server. For win* OS you can select how many independent displays you want, Linux guests can add displays them self.
+You can also run without any graphic card, using a serial device as terminal.
+
+`memory`=`<integer> (4 - 512)` ;;
+
+Sets the VGA memory (in MiB). Has no effect with serial display.
+
+`type`=`<cirrus | qxl | qxl2 | qxl3 | qxl4 | serial0 | serial1 | serial2 | serial3 | std | virtio | vmware>` ('default =' `std`);;
 
-Select the VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use the options 'std' or 'vmware'. Default is 'std' for win8/win7/w2k8, and 'cirrus' for other OS types. The 'qxl' option enables the SPICE display sever. For win* OS you can select how many independent displays you want, Linux guests can add displays them self. You can also run without any graphic card, using a serial device as terminal.
+Select the VGA type.
 
 `virtio[n]`: `[file=]<volume> [,aio=<native|threads>] [,backup=<1|0>] [,bps=<bps>] [,bps_max_length=<seconds>] [,bps_rd=<bps>] [,bps_rd_max_length=<seconds>] [,bps_wr=<bps>] [,bps_wr_max_length=<seconds>] [,cache=<enum>] [,cyls=<integer>] [,detect_zeroes=<1|0>] [,discard=<ignore|on>] [,format=<enum>] [,heads=<integer>] [,iops=<iops>] [,iops_max=<iops>] [,iops_max_length=<seconds>] [,iops_rd=<iops>] [,iops_rd_max=<iops>] [,iops_rd_max_length=<seconds>] [,iops_wr=<iops>] [,iops_wr_max=<iops>] [,iops_wr_max_length=<seconds>] [,iothread=<1|0>] [,mbps=<mbps>] [,mbps_max=<mbps>] [,mbps_rd=<mbps>] [,mbps_rd_max=<mbps>] [,mbps_wr=<mbps>] [,mbps_wr_max=<mbps>] [,media=<cdrom|disk>] [,replicate=<1|0>] [,rerror=<ignore|report|stop>] [,secs=<integer>] [,serial=<serial>] [,shared=<1|0>] [,size=<DiskSize>] [,snapshot=<1|0>] [,trans=<none|lba|auto>] [,werror=<enum>]` ::