qm-cpu-settings.png: replace wrong screenshot

[pve-docs.git] / qm.adoc

diff --git a/qm.adoc b/qm.adoc
index eeb4ae673c13381d1d47a2be4fad750f55fbefe0..8eab627e8423554947f8c56fb0ec8e1dbe29c8a4 100644 (file)
--- a/qm.adoc
+++ b/qm.adoc
@@ -2,7 +2,6 @@
 ifdef::manvolnum[]
 qm(1)
 =====
 ifdef::manvolnum[]
 qm(1)
 =====

-include::attributes.txt[]

 :pve-toplevel:
 
 NAME
 :pve-toplevel:
 
 NAME


@@ -22,7 +21,6 @@ endif::manvolnum[]
 ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================
 ifndef::manvolnum[]
 Qemu/KVM Virtual Machines
 =========================

-include::attributes.txt[]

 :pve-toplevel:
 endif::manvolnum[]
 
 :pve-toplevel:
 endif::manvolnum[]
 


@@ -103,6 +101,8 @@ could incur a performance slowdown, or putting your data at risk.
 General Settings
 ~~~~~~~~~~~~~~~~
 
 General Settings
 ~~~~~~~~~~~~~~~~
 

+[thumbnail="qm-general-settings.png"]
+

 General settings of a VM include
 
 * the *Node* : the physical server on which the VM will run
 General settings of a VM include
 
 * the *Node* : the physical server on which the VM will run


@@ -115,6 +115,8 @@ General settings of a VM include
 OS Settings
 ~~~~~~~~~~~
 
 OS Settings
 ~~~~~~~~~~~
 

+[thumbnail="qm-os-settings.png"]
+

 When creating a VM, setting the proper Operating System(OS) allows {pve} to
 optimize some low level parameters. For instance Windows OS expect the BIOS
 clock to use the local time, while Unix based OS expect the BIOS clock to have
 When creating a VM, setting the proper Operating System(OS) allows {pve} to
 optimize some low level parameters. For instance Windows OS expect the BIOS
 clock to use the local time, while Unix based OS expect the BIOS clock to have


@@ -152,6 +154,7 @@ containing the drivers during the installation.
 the Virtio SCSI controller, is an older type of paravirtualized controller
 which has been superseded in features by the Virtio SCSI Controller.
 
 the Virtio SCSI controller, is an older type of paravirtualized controller
 which has been superseded in features by the Virtio SCSI Controller.
 

+[thumbnail="qm-hard-disk.png"]

 On each controller you attach a number of emulated hard disks, which are backed
 by a file or a block device residing in the configured storage. The choice of
 a storage type will determine the format of the hard disk image. Storages which
 On each controller you attach a number of emulated hard disks, which are backed
 by a file or a block device residing in the configured storage. The choice of
 a storage type will determine the format of the hard disk image. Storages which


@@ -198,6 +201,8 @@ Note that backups do not currently work with *IO Thread* enabled.
 CPU
 ~~~
 
 CPU
 ~~~
 

+[thumbnail="qm-cpu-settings.png"]
+

 A *CPU socket* is a physical slot on a PC motherboard where you can plug a CPU.
 This CPU can then contain one or many *cores*, which are independent
 processing units. Whether you have a single CPU socket with 4 cores, or two CPU
 A *CPU socket* is a physical slot on a PC motherboard where you can plug a CPU.
 This CPU can then contain one or many *cores*, which are independent
 processing units. Whether you have a single CPU socket with 4 cores, or two CPU


@@ -264,9 +269,15 @@ For each VM you have the option to set a fixed size memory or asking
 {pve} to dynamically allocate memory based on the current RAM usage of the
 host. 
 
 {pve} to dynamically allocate memory based on the current RAM usage of the
 host. 
 

+.Fixed Memory Allocation
+[thumbnail="qm-memory-fixed.png"]
+

 When choosing a *fixed size memory* {pve} will simply allocate what you
 specify to your VM.
 
 When choosing a *fixed size memory* {pve} will simply allocate what you
 specify to your VM.
 

+.Automatic Memory Allocation
+[thumbnail="qm-memory-auto.png", float="left"]
+

 // see autoballoon() in pvestatd.pm
 When choosing to *automatically allocate memory*, {pve} will make sure that the
 minimum amount you specified is always available to the VM, and if RAM usage on
 // see autoballoon() in pvestatd.pm
 When choosing to *automatically allocate memory*, {pve} will make sure that the
 minimum amount you specified is always available to the VM, and if RAM usage on


@@ -306,6 +317,8 @@ of RAM available to the host.
 Network Device
 ~~~~~~~~~~~~~~
 
 Network Device
 ~~~~~~~~~~~~~~
 

+[thumbnail="qm-network.png"]
+

 Each VM can have many _Network interface controllers_ (NIC), of four different
 types:
 
 Each VM can have many _Network interface controllers_ (NIC), of four different
 types: