Merge pull request #23 from SheerIce/patch-1

Update xenserver.rstFixed typo.

* pr/23:
  Update xenserver.rst

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
diff --git a/source/configuration.rst b/source/configuration.rst
index c1771dc..daa8292 100644
--- a/source/configuration.rst
+++ b/source/configuration.rst
@@ -1061,6 +1061,10 @@
    on the KVM host and set the parameter network.bridge.type to
    openvswitch before adding the host to CloudStack
 
+-  If you're using a non-root user to add a KVM host, please add the user to
+   sudoers file:
+      cloudstack ALL=NOPASSWD: /usr/bin/cloudstack-setup-agent
+      defaults:cloudstack !requiretty
 
 Adding a XenServer or KVM Host
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/source/hypervisor/kvm.rst b/source/hypervisor/kvm.rst
index fbf24bf..f729998 100644
--- a/source/hypervisor/kvm.rst
+++ b/source/hypervisor/kvm.rst
@@ -161,6 +161,14 @@
 recommended that you continue to read the documentation before adding
 the host!
 
+If you're using a non-root user to add the KVM host, please add the user to
+sudoers file:
+
+.. sourcecode:: bash
+
+   cloudstack ALL=NOPASSWD: /usr/bin/cloudstack-setup-agent
+   defaults:cloudstack !requiretty
+
 
 Configure CPU model for KVM guest (Optional)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -180,12 +188,13 @@
 For the most part it will be sufficient for the host administrator to
 specify the guest CPU config in the per-host configuration file
 (/etc/cloudstack/agent/agent.properties). This will be achieved by
-introducing two new configuration parameters:
+introducing following configuration parameters:
 
 .. sourcecode:: bash
 
    guest.cpu.mode=custom|host-model|host-passthrough
    guest.cpu.model=from /usr/share/libvirt/cpu_map.xml(only valid when guest.cpu.mode=custom)
+   guest.cpu.features=vmx ept aes smx mmx ht (space separated list of cpu flags to apply)
 
 There are three choices to fulfill the cpu model changes:
 
@@ -227,11 +236,13 @@
    .. sourcecode:: bash
 
       guest.cpu.mode=host-passthrough
+      guest.cpu.features=vmx
 
 .. note:: 
    host-passthrough may lead to migration failure,if you have this problem, 
-   you should use host-model or custom
-
+   you should use host-model or custom. guest.cpu.features will force cpu features
+   as a required policy so make sure to put only those features that are provided
+   by the host CPU.
 
 Install and Configure libvirt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~