|
 |
9119d9 |
From d04153f6a23a16505e9263cc0f4e13c32a8db8d2 Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <d04153f6a23a16505e9263cc0f4e13c32a8db8d2@dist-git>
|
|
|
9119d9 |
From: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
Date: Thu, 15 Jan 2015 15:03:46 +0100
|
|
|
9119d9 |
Subject: [PATCH] qemu: Remove unnecessary qemuSetupCgroupPostInit function
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1161540
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
(cherry picked from commit f801a81208e113782c737f70171cbfe3e1e6f7dd)
|
|
|
9119d9 |
Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_cgroup.c | 9 +--------
|
|
|
9119d9 |
src/qemu/qemu_cgroup.h | 4 ++--
|
|
|
9119d9 |
src/qemu/qemu_process.c | 2 +-
|
|
|
9119d9 |
3 files changed, 4 insertions(+), 11 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
index 7609c0f..ac12f43 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_cgroup.c
|
|
|
9119d9 |
@@ -607,7 +607,7 @@ qemuSetupDevicesCgroup(virQEMUDriverPtr driver,
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
|
|
|
9119d9 |
-static int
|
|
|
9119d9 |
+int
|
|
|
9119d9 |
qemuSetupCpusetMems(virDomainObjPtr vm,
|
|
|
9119d9 |
virBitmapPtr nodemask)
|
|
|
9119d9 |
{
|
|
|
9119d9 |
@@ -863,13 +863,6 @@ qemuSetupCgroup(virQEMUDriverPtr driver,
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
int
|
|
|
9119d9 |
-qemuSetupCgroupPostInit(virDomainObjPtr vm,
|
|
|
9119d9 |
- virBitmapPtr nodemask)
|
|
|
9119d9 |
-{
|
|
|
9119d9 |
- return qemuSetupCpusetMems(vm, nodemask);
|
|
|
9119d9 |
-}
|
|
|
9119d9 |
-
|
|
|
9119d9 |
-int
|
|
|
9119d9 |
qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
|
|
|
9119d9 |
unsigned long long period,
|
|
|
9119d9 |
long long quota)
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h
|
|
|
9119d9 |
index 8a2c723..2ae16df 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_cgroup.h
|
|
|
9119d9 |
+++ b/src/qemu/qemu_cgroup.h
|
|
|
9119d9 |
@@ -47,8 +47,8 @@ int qemuConnectCgroup(virQEMUDriverPtr driver,
|
|
|
9119d9 |
int qemuSetupCgroup(virQEMUDriverPtr driver,
|
|
|
9119d9 |
virDomainObjPtr vm,
|
|
|
9119d9 |
virBitmapPtr nodemask);
|
|
|
9119d9 |
-int qemuSetupCgroupPostInit(virDomainObjPtr vm,
|
|
|
9119d9 |
- virBitmapPtr nodemask);
|
|
|
9119d9 |
+int qemuSetupCpusetMems(virDomainObjPtr vm,
|
|
|
9119d9 |
+ virBitmapPtr nodemask);
|
|
|
9119d9 |
int qemuSetupCgroupVcpuBW(virCgroupPtr cgroup,
|
|
|
9119d9 |
unsigned long long period,
|
|
|
9119d9 |
long long quota);
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
9119d9 |
index d965938..c055eb7 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_process.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_process.c
|
|
|
9119d9 |
@@ -4796,7 +4796,7 @@ int qemuProcessStart(virConnectPtr conn,
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
VIR_DEBUG("Setting up post-init cgroup restrictions");
|
|
|
9119d9 |
- if (qemuSetupCgroupPostInit(vm, nodemask) < 0)
|
|
|
9119d9 |
+ if (qemuSetupCpusetMems(vm, nodemask) < 0)
|
|
|
9119d9 |
goto cleanup;
|
|
|
9119d9 |
|
|
|
9119d9 |
VIR_DEBUG("Detecting VCPU PIDs");
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.2.1
|
|
|
9119d9 |
|