render / rpms / libvirt

Forked from rpms/libvirt 10 months ago
Clone
Blob Blame History Raw
From ae1ca2fd5fe27ca5c69bb67683990f50adda769d Mon Sep 17 00:00:00 2001
Message-Id: <ae1ca2fd5fe27ca5c69bb67683990f50adda769d.1390394207.git.jdenemar@redhat.com>
From: Osier Yang <jyang@redhat.com>
Date: Wed, 22 Jan 2014 18:11:59 +0800
Subject: [PATCH] Doc: Add "note" for node-memory-tune

https://bugzilla.redhat.com/show_bug.cgi?id=1045089

To let the user know the command onlys work for KSM under Linux.
(cherry picked from commit deb924dda8d64bfe724114c7c5f5dccb56e2dd9f)

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 tools/virsh.pod | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 6b47d59..6b25e99 100644
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -306,6 +306,7 @@ in seconds for which the host has to be suspended, it should be at least
 60 seconds.
 
 =item B<node-memory-tune> [I<shm-pages-to-scan>] [I<shm-sleep-millisecs>]
+I<shm-merge-across-nodes>
 
 Allows you to display or set the node memory parameters.
 I<shm-pages-to-scan> can be used to set the number of pages to scan
@@ -316,6 +317,9 @@ different numa nodes can be merged. When set to 0, only pages which physically
 reside in the memory area of same NUMA node can be merged. When set to 1,
 pages from all nodes can be merged. Default to 1.
 
+B<Note>: Currently the "shared memory service" only means KSM (Kernel Samepage
+Merging).
+
 =item B<capabilities>
 
 Print an XML document describing the capabilities of the hypervisor
-- 
1.8.5.3