[libvirt] [PATCHv2 2/3] qemu_cgroup: put qemu right into emulator sub-cgroup

[Henning Schild]

On Tue, 1 Mar 2016 11:20:18 +0000
"Daniel P. Berrange" <berrange at redhat.com> wrote:

> On Fri, Feb 26, 2016 at 04:34:23PM +0100, Henning Schild wrote:
> > Move qemuProcessSetupEmulator up under qemuSetupCgroup. That way
> > we move the one main thread right into the emulator cgroup, instead
> > of moving multiple threads later on. And we do not actually want any
> > threads running in the parent cgroups (cpu cpuacct cpuset).
> > 
> > Signed-off-by: Henning Schild <henning.schild at siemens.com>
> > ---
> >  src/qemu/qemu_process.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> > index 0c43183..7725a5f 100644
> > --- a/src/qemu/qemu_process.c
> > +++ b/src/qemu/qemu_process.c
> > @@ -5087,6 +5087,10 @@ qemuProcessLaunch(virConnectPtr conn,
> >          qemuProcessInitCpuAffinity(vm) < 0)
> >          goto cleanup;
> >  
> > +    VIR_DEBUG("Setting emulator tuning/settings");
> > +    if (qemuProcessSetupEmulator(vm) < 0)
> > +        goto cleanup;
> > +
> >      VIR_DEBUG("Setting domain security labels");
> >      if (virSecurityManagerSetAllLabel(driver->securityManager,
> >                                        vm->def,
> > @@ -5129,10 +5133,6 @@ qemuProcessLaunch(virConnectPtr conn,
> >      if (rv == -1) /* The VM failed to start */
> >          goto cleanup;
> >  
> > -    VIR_DEBUG("Setting emulator tuning/settings");
> > -    if (qemuProcessSetupEmulator(vm) < 0)
> > -        goto cleanup;
> > -
> >      VIR_DEBUG("Waiting for monitor to show up");
> >      if (qemuProcessWaitForMonitor(driver, vm, asyncJob,
> > priv->qemuCaps, logCtxt) < 0) goto cleanup;  
> 
> Do you have some other local patches applied to your git ?  I just
> went to apply this and realized that qemuProcessSetupEmulator() does
> not actually exist. It git master the function is
> qemuSetupCgroupForEmulator and there is another function call
> qemuProcessSetEmulatorAffinity just after it too.  So I can't apply
> this patch

Yes i have two other patches that John also wanted to merge. They would
have conflicted with mine. See cover letter of this series.

> Regards,
> Daniel