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

On Wed, Mar 09, 2011 at 05:13:47PM +0900, KAMEZAWA Hiroyuki wrote: > diff --git a/docs/schemas/domain.rng b/docs/schemas/domain.rng > index 8b215f3..2ac50a4 100644 > --- a/docs/schemas/domain.rng > +++ b/docs/schemas/domain.rng > @@ -341,7 +341,7 @@ > </optional> > <!-- Maximum swap area the VM can use --> > <optional> > - <element name="swap_hard_limit"> > + <element name="memswap_hard_limit"> > <ref name="memoryKB"/> > </element> > </optional> > diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in > index 618b350..d2600fa 100644 > --- a/include/libvirt/libvirt.h.in > +++ b/include/libvirt/libvirt.h.in > @@ -735,13 +735,21 @@ typedef enum { > #define VIR_DOMAIN_MEMORY_MIN_GUARANTEE "min_guarantee" > > /** > - * VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT: > + * VIR_DOMAIN_MEMORY_MEMSWAP_HARD_LIMIT: > * > - * Macro for the swap tunable swap_hard_limit: it represents the maximum swap > - * the guest can use. > + * Macro for the swap tunable memswap_hard_limit: it represents the maximum > + * memory+swap the guest can use. > */ > > -#define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "swap_hard_limit" > +#define VIR_DOMAIN_MEMORY_MEMSWAP_HARD_LIMIT "memswap_hard_limit" > + > +/** > + * VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT > + * > + * macro for comaptibility with old version. please use > + * VIR_DOMAIN_MEMORY_MEMSWAP_HARD_LIMIT > + */ > +#define VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT "memswap_hard_limit" > > /** > * virDomainMemoryParameter: NACK to both these changes. The XML and public API must *never* be changed once included in a release. The current names may not be the perfect choices, but we can't change them now I'm afraid.