Re: [libvirt] [PATCH 04/12] conf: introduce 3 functions for RNG device

The subject is vague. Please try to condense what the patch is adding in a way that describes the functions instead of an opaque "add 3 functions" On 01/03/15 06:06, Luyao Huang wrote: If you add a block here and move the VIR_DELETE_ELEMENT line here. And return ret instead of breaking here. Then you can "return NULL" here and get rid of the rest. The resulting code will be more readable. > + > + if (i == vmdef->nrngs) > + return NULL; > + > + VIR_DELETE_ELEMENT(vmdef->rngs, i, vmdef->nrngs); > + return ret; > +} > + > +virDomainRNGDefPtr > +virDomainRNGFind(virDomainDefPtr vmdef, > + virDomainRNGDefPtr rng) > +{ > + virDomainRNGDefPtr ret; > + size_t i; > + > + for (i = 0; i < vmdef->nrngs; i++) { > + ret = vmdef->rngs[i]; > + > + if (virDomainRNGEquals(ret, rng)) > + return ret; > + return NULL; > +} > + > char * > virDomainDefGetDefaultEmulator(virDomainDefPtr def, > virCapsPtr caps) > diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h > index c197095..cb87fad 100644 > --- a/src/conf/domain_conf.h > +++ b/src/conf/domain_conf.h > @@ -2600,6 +2600,15 @@ virDomainChrRemove(virDomainDefPtr vmdef, > bool > virDomainRNGEquals(virDomainRNGDefPtr src, > virDomainRNGDefPtr tgt); > +int > +virDomainRNGInsert(virDomainDefPtr vmdef, > + virDomainRNGDefPtr rng); In header files we usually put the return type on the same line as the declaration. Like here. Peter