Re: [PATCH] rename cfs_* to vcpu_*

[Wen Congyang <wencongyang@xxxxxxxxx>]

At 07/25/2011 05:49 PM, Daniel Veillard write:
> On Mon, Jul 25, 2011 at 01:38:51PM +0800, Wen Congyang wrote:
> > In the XML file we now have
> >
> >    <cputune>
> >      <shares>1024</shares>
> >      <period>90000</period>
> >      <quota>0</quota>
> >    </cputune>
> >
> > But the schedinfo parameter are being named
> >
> >   cpu_shares: 1024
> >   cfs_period: 90000
> >   cfs_quota: 0
> >
> > The period/quota is per-vcpu value, so these new tunables should be named
> > 'vcpu_period' and 'vcpu_quota'.
> >
> > ---
> >   src/qemu/qemu_driver.c |   16 ++++++++--------
> >   1 files changed, 8 insertions(+), 8 deletions(-)
> >
> > diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
> > index 52e5d69..9cae318 100644
> > --- a/src/qemu/qemu_driver.c
> > +++ b/src/qemu/qemu_driver.c
> > @@ -6243,10 +6243,10 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom,
> >               if (flags&  VIR_DOMAIN_AFFECT_CONFIG) {
> >                   vmdef->cputune.shares = params[i].value.ul;
> >               }
> > -        } else if (STREQ(param->field, "cfs_period")) {
> > +        } else if (STREQ(param->field, "vcpu_period")) {
> >               if (param->type != VIR_TYPED_PARAM_ULLONG) {
> >                   qemuReportError(VIR_ERR_INVALID_ARG, "%s",
> > -                                _("invalid type for cfs_period tunable,"
> > +                                _("invalid type for vcpu_period tunable,"
> >                                     " expected a 'ullong'"));
> >                   goto cleanup;
> >               }
> > @@ -6263,10 +6263,10 @@ static int qemuSetSchedulerParametersFlags(virDomainPtr dom,
> >               if (flags&  VIR_DOMAIN_AFFECT_CONFIG) {
> >                   vmdef->cputune.period = params[i].value.ul;
> >               }
> > -        } else if (STREQ(param->field, "cfs_quota")) {
> > +        } else if (STREQ(param->field, "vcpu_quota")) {
> >               if (param->type != VIR_TYPED_PARAM_LLONG) {
> >                   qemuReportError(VIR_ERR_INVALID_ARG, "%s",
> > -                                _("invalid type for cfs_quota tunable,"
> > +                                _("invalid type for vcpu_quota tunable,"
> >                                     " expected a 'llong'"));
> >                   goto cleanup;
> >               }
> > @@ -6525,10 +6525,10 @@ out:
> >           if (*nparams>  saved_nparams) {
> >               params[1].value.ul = period;
> >               params[1].type = VIR_TYPED_PARAM_ULLONG;
> > -            if (virStrcpyStatic(params[1].field, "cfs_period") == NULL) {
> > +            if (virStrcpyStatic(params[1].field, "vcpu_period") == NULL) {
> >                   qemuReportError(VIR_ERR_INTERNAL_ERROR,
> >                                   "%s",
> > -                                _("Field cfs_period too long for destination"));
> > +                                _("Field vcpu_period too long for destination"));
> >                   goto cleanup;
> >               }
> >               saved_nparams++;
> > @@ -6537,10 +6537,10 @@ out:
> >           if (*nparams>  saved_nparams) {
> >               params[2].value.ul = quota;
> >               params[2].type = VIR_TYPED_PARAM_LLONG;
> > -            if (virStrcpyStatic(params[2].field, "cfs_quota") == NULL) {
> > +            if (virStrcpyStatic(params[2].field, "vcpu_quota") == NULL) {
> >                   qemuReportError(VIR_ERR_INTERNAL_ERROR,
> >                                   "%s",
> > -                                _("Field cfs_quota too long for destination"));
> > +                                _("Field vcpu_quota too long for destination"));
> >                   goto cleanup;
> >               }
> >               saved_nparams++;
>
>    ACK,

Thanks, pushed.

Wen Congyang

> Daniel

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list