From b58241a6902285a598acde6387274658bbcce4ad Mon Sep 17 00:00:00 2001
From: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
Date: Tue, 8 Feb 2011 10:41:17 -0700
Subject: [PATCH] cgroup: Enable cgroup hierarchy for blkio cgroup

Enable cgroup hierarchy for blkio cgroup

Acked-by: Daniel P. Berrange <berrange@redhat.com>
Signed-off-by: Gui Jianfeng <guijianfeng@cn.fujitsu.com>
---
 AUTHORS           | 1 +
 src/util/cgroup.c | 2 +-
 src/util/cgroup.h | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/AUTHORS b/AUTHORS
index 6cdc729f4b..0b904ce4a7 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -152,6 +152,7 @@ Patches have also been contributed by:
   Alon Levy            <alevy@redhat.com>
   Hero Phương          <herophuong93@gmail.com>
   Zdenek Styblik       <stybla@turnovfree.net>
+  Gui Jianfeng         <guijianfeng@cn.fujitsu.com>
 
   [....send patches to get your name here....]
 
diff --git a/src/util/cgroup.c b/src/util/cgroup.c
index cd9caba283..309f4e9b58 100644
--- a/src/util/cgroup.c
+++ b/src/util/cgroup.c
@@ -37,7 +37,7 @@
 
 VIR_ENUM_IMPL(virCgroupController, VIR_CGROUP_CONTROLLER_LAST,
               "cpu", "cpuacct", "cpuset", "memory", "devices",
-              "freezer");
+              "freezer", "blkio");
 
 struct virCgroupController {
     int type;
diff --git a/src/util/cgroup.h b/src/util/cgroup.h
index 964da7a102..67b1299023 100644
--- a/src/util/cgroup.h
+++ b/src/util/cgroup.h
@@ -22,6 +22,7 @@ enum {
     VIR_CGROUP_CONTROLLER_MEMORY,
     VIR_CGROUP_CONTROLLER_DEVICES,
     VIR_CGROUP_CONTROLLER_FREEZER,
+    VIR_CGROUP_CONTROLLER_BLKIO,
 
     VIR_CGROUP_CONTROLLER_LAST
 };
-- 
GitLab