[libvirt] [PATCH v2 2/5] cgroup macros refactoring

[Eric Blake]

On 08/11/2013 06:04 AM, Roman Bogorodskiy wrote:
> - Convert virCgroupGet* to VIR_CGROUP_SUPPORTED
> - Convert virCgroup(Get|Set)FreezerState to VIR_CGROUP_SUPPORTED
> - Convert virCgroupRemoveRecursively to VIR_CGROUP_SUPPORTED
> ---
>  src/util/vircgroup.c | 363 +++++++++++++++++++++++++++++----------------------
>  1 file changed, 204 insertions(+), 159 deletions(-)

Hmm - 5 identical subject lines (after the [] gets stripped) makes
reviewing git history a bit harder.  Also, when sending a series, it
helps to send a cover letter (git send-email --cover-letter adds a 0/5
message, and makes all the other messages a reply to that one).  But
don't worry about that; I can touch it up as part of testing the series.

> 
> diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
> index 5f656b1..3640fbd 100644
> --- a/src/util/vircgroup.c
> +++ b/src/util/vircgroup.c
> @@ -57,7 +57,7 @@
>  #define VIR_FROM_THIS VIR_FROM_CGROUP
>  
>  #if defined(__linux__) && defined(HAVE_GETMNTENT_R) \
> - && defined(_DIRENT_HAVE_D_TYPE)
> + && defined(_DIRENT_HAVE_D_TYPE) && defined(_SC_CLK_TCK)

Hmm, I'm wondering whether this changes behavior on any version of Linux
old enough to lack _SC_CLK_TCK (that is, changing from partial cgroup
support to no cgroup support)...
/me checks RHEL 5...
phew - _SC_CLK_TCK has existed for a long time, and as RHEL 5 is really
the oldest kernel we care about supporting, this is just fine.

> @@ -3039,6 +3032,7 @@ int virCgroupKill(virCgroupPtr group ATTRIBUTE_UNUSED,
>      return -1;
>  }
>  
> +
>  int virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
>                             int signum ATTRIBUTE_UNUSED)
>  {
> @@ -3047,6 +3041,7 @@ int virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED,
>      return -1;
>  }
>  
> +
>  int virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED)

I squashed these hunks into 1/5.

ACK.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

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