From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39556) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f1Fl9-0001KB-K6 for qemu-devel@nongnu.org; Wed, 28 Mar 2018 14:25:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f1Fl8-0008FJ-H9 for qemu-devel@nongnu.org; Wed, 28 Mar 2018 14:25:19 -0400 Date: Wed, 28 Mar 2018 14:25:10 -0400 From: Jeff Cody Message-ID: <20180328182510.GB30186@localhost.localdomain> References: <20180327153011.29569-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20180327153011.29569-1-marcandre.lureau@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH] blockjob: use qapi enum helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?iso-8859-1?Q?Marc-Andr=E9?= Lureau Cc: qemu-devel@nongnu.org, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org On Tue, Mar 27, 2018 at 05:30:11PM +0200, Marc-Andr=E9 Lureau wrote: > QAPI generator provide #define helpers for looking up enum string. >=20 > Signed-off-by: Marc-Andr=E9 Lureau > --- > blockjob.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) >=20 > diff --git a/blockjob.c b/blockjob.c > index ef3ed69ff1..11c9ce124d 100644 > --- a/blockjob.c > +++ b/blockjob.c > @@ -75,10 +75,8 @@ static void block_job_state_transition(BlockJob *job= , BlockJobStatus s1) > assert(s1 >=3D 0 && s1 <=3D BLOCK_JOB_STATUS__MAX); > trace_block_job_state_transition(job, job->ret, BlockJobSTT[s0][s1= ] ? > "allowed" : "disallowed", > - qapi_enum_lookup(&BlockJobStatus_= lookup, > - s0), > - qapi_enum_lookup(&BlockJobStatus_= lookup, > - s1)); > + BlockJobStatus_str(s0), > + BlockJobStatus_str(s1)); > assert(BlockJobSTT[s0][s1]); > job->status =3D s1; > } > @@ -86,17 +84,15 @@ static void block_job_state_transition(BlockJob *jo= b, BlockJobStatus s1) > static int block_job_apply_verb(BlockJob *job, BlockJobVerb bv, Error = **errp) > { > assert(bv >=3D 0 && bv <=3D BLOCK_JOB_VERB__MAX); > - trace_block_job_apply_verb(job, qapi_enum_lookup(&BlockJobStatus_l= ookup, > - job->status), > - qapi_enum_lookup(&BlockJobVerb_lookup, = bv), > + trace_block_job_apply_verb(job, BlockJobStatus_str(job->status), > + BlockJobVerb_str(bv), > BlockJobVerbTable[bv][job->status] ? > "allowed" : "prohibited"); > if (BlockJobVerbTable[bv][job->status]) { > return 0; > } > error_setg(errp, "Job '%s' in state '%s' cannot accept command ver= b '%s'", > - job->id, qapi_enum_lookup(&BlockJobStatus_lookup, job->= status), > - qapi_enum_lookup(&BlockJobVerb_lookup, bv)); > + job->id, BlockJobStatus_str(job->status), BlockJobVerb_= str(bv)); > return -EPERM; > } > =20 > --=20 > 2.17.0.rc1.1.g4c4f2b46a3 >=20 Thanks, Looks like a bug fix to me. Applied to my block branch: git://github.com/codyprime/qemu-kvm-jtc block -Jeff