[libvirt] [PATCH] virsh: fix memtune's help message for swap_hard_limit

Eric Blake eblake at redhat.com
Thu Mar 17 23:00:04 UTC 2011


On 03/15/2011 11:07 PM, Nikunj A. Dadhania wrote:
>> Hmm. Then, only messages should be fixed. Nikunj, please fix.
>>
> Ok, here is the patch with doc changes and cgroup api rename
> 
> ==
> From: Nikunj A. Dadhania <nikunj at linux.vnet.ibm.com>
> 
> * Correct the documentation for cgroup: the swap_hard_limit indicates
>   mem+swap_hard_limit.
> * Change cgroup private apis to: virCgroupGet/SetMemSwapHardLimit
> 
> Signed-off-by: Nikunj A. Dadhania <nikunj at linux.vnet.ibm.com>

Hmm, I had merge conflicts when applying this.  You may want to double
check the result; it looks like you haven't updated your copy of git in
a while.  It's good to use 'git rebase' before posting updated patches;
personally, I like the results of 'git config branch.master.rebase true'
which tells git to automatically rebase my pending changes on top of the
latest upstream any time I do 'git pull'.

> 
> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
> index dad268d..52bd4e6 100644
> --- a/docs/formatdomain.html.in
> +++ b/docs/formatdomain.html.in
> @@ -231,8 +231,9 @@
>  	kilobytes (i.e. blocks of 1024 bytes)</dd>
>        <dt><code>swap_hard_limit</code></dt>
>        <dd> The optional <code>swap_hard_limit</code> element is the maximum
> -	swap the guest can use. The units for this value are kilobytes
> -	(i.e. blocks of 1024 bytes)</dd>
> +	memory plus swap the guest can use. The units for this value are
> +	kilobytes (i.e. blocks of 1024 bytes). This has to be more than
> +	hard_limit value provided</dd>

No TABs in html.in.  'make syntax-check' should warn on that since
commit 1652fa2f on 9 Feb.

ACK that this version only touches public docs and private functions,
which is acceptable.  Once I rebased it onto modern libvirt.git, I
pushed it.

-- 
Eric Blake   eblake at redhat.com    +1-801-349-2682
Libvirt virtualization library http://libvirt.org

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 619 bytes
Desc: OpenPGP digital signature
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20110317/c3352686/attachment-0001.sig>


More information about the libvir-list mailing list