c401cc
From ae1ca2fd5fe27ca5c69bb67683990f50adda769d Mon Sep 17 00:00:00 2001
c401cc
Message-Id: <ae1ca2fd5fe27ca5c69bb67683990f50adda769d.1390394207.git.jdenemar@redhat.com>
c401cc
From: Osier Yang <jyang@redhat.com>
c401cc
Date: Wed, 22 Jan 2014 18:11:59 +0800
c401cc
Subject: [PATCH] Doc: Add "note" for node-memory-tune
c401cc
c401cc
https://bugzilla.redhat.com/show_bug.cgi?id=1045089
c401cc
c401cc
To let the user know the command onlys work for KSM under Linux.
c401cc
(cherry picked from commit deb924dda8d64bfe724114c7c5f5dccb56e2dd9f)
c401cc
c401cc
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
c401cc
---
c401cc
 tools/virsh.pod | 4 ++++
c401cc
 1 file changed, 4 insertions(+)
c401cc
c401cc
diff --git a/tools/virsh.pod b/tools/virsh.pod
c401cc
index 6b47d59..6b25e99 100644
c401cc
--- a/tools/virsh.pod
c401cc
+++ b/tools/virsh.pod
c401cc
@@ -306,6 +306,7 @@ in seconds for which the host has to be suspended, it should be at least
c401cc
 60 seconds.
c401cc
 
c401cc
 =item B<node-memory-tune> [I<shm-pages-to-scan>] [I<shm-sleep-millisecs>]
c401cc
+I<shm-merge-across-nodes>
c401cc
 
c401cc
 Allows you to display or set the node memory parameters.
c401cc
 I<shm-pages-to-scan> can be used to set the number of pages to scan
c401cc
@@ -316,6 +317,9 @@ different numa nodes can be merged. When set to 0, only pages which physically
c401cc
 reside in the memory area of same NUMA node can be merged. When set to 1,
c401cc
 pages from all nodes can be merged. Default to 1.
c401cc
 
c401cc
+B<Note>: Currently the "shared memory service" only means KSM (Kernel Samepage
c401cc
+Merging).
c401cc
+
c401cc
 =item B<capabilities>
c401cc
 
c401cc
 Print an XML document describing the capabilities of the hypervisor
c401cc
-- 
c401cc
1.8.5.3
c401cc