summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominique Martinet <asmadeus@codewreck.org>2016-01-27 18:45:46 +0100
committerDominique Martinet <dominique.martinet@cea.fr>2016-02-02 15:44:09 +0100
commit69218279821137fbbc1feddce86f319616a50cbe (patch)
treef2f595d4e7033ef1e735e1aecc534783574dd499
parenta4b33a3130bb50bad6e9d794c727f553b164720e (diff)
conf update
-rw-r--r--kvm-wrapper.conf.default18
1 files changed, 12 insertions, 6 deletions
diff --git a/kvm-wrapper.conf.default b/kvm-wrapper.conf.default
index df08674..50d4037 100644
--- a/kvm-wrapper.conf.default
+++ b/kvm-wrapper.conf.default
@@ -58,6 +58,15 @@ KVM_NET_OPT[0]=""
#KVM_NET_OPT[0]=",vhost=on"
#KVM_NET_MTU[0]="9000"
#KVM_{IF,MACADDR,BR,NET_OPT,NET_MTU}[n]
+#KVM_MACVTAP="yes" # global switch for now..
+
+#KVM_IF[x]="sriov"
+
+#KVM_IF[x]="mlx5-sriov"
+#KVM_MACADDR[x]=<guid>
+
+#KVM_IF[x]="mlx4-sriov"
+#KVM_MACADDR[x]="pkey list"
KVM_BOOTDEVICE="-boot order=c"
#KVM_DISK[0]
@@ -72,18 +81,15 @@ KVM_DISK_OPT[0]=",cache=none,aio=native"
#KVM_VFIO_DOMAIN[0] # 01:00.0
#KVM_VFIO_ID[0] # "fooidname" (id string, no comma/whitespace/equalsign)
-#KVM_SRIOV_DEV # which master device you want e.g. mlx5_0 - picks any if unset
-#KVM_SRIOV_PKEYS # space-separated list of pkeys you want to feed to your VM (mlx4 only)
-#KVM_SRIOV_GUID # guid you want inside VM (mlx5 only, this defines the pkeys you'll get through opensm config)
-
#KVM_PIN_PCI # will resolve to /sys/bus/pci/devices/*${KVM_PIN_PCI}/numa_node
#KVM_PIN_NODE # 0-1 (must be accepted by both numactl -N and qemu host-nodes)
#KVM_NUMACTL_OPT # numactl opts, e.g. --membind=pci:01:00.0 --cpunodebind=pci:01:00.0
#KVM_MEM_POLICY # for memory-backend-ram, e.g. preferred -- will use KVM_MEM for size.
-# Setting user requires access to: /dev/kvm, /dev/net/tun,
-# /dev/vhost-net, /dev/vfio/vfio and ulimit -l big
+# Setting user requires access to: /dev/kvm, /dev/vfio/vfio
+# locked mem requires ulimit -l big (/etc/security/limits.conf)
+# systemd service requires no session pam_systemd for user (sufficient pam_succeed_if.so user = qemu or just none)
#KVM_USER="qemu"
KVM_KEYMAP=""
#KVM_KEYMAP="-k en-us"