Re: [qemu-s390x] [PATCH v1 2/3] s390x/sclp: clean up sclp masks

[Cornelia Huck]

On Wed, 21 Feb 2018 17:42:57 +0100
Claudio Imbrenda <address@hidden> wrote:

> On Wed, 21 Feb 2018 16:20:05 +0100
> Cornelia Huck <address@hidden> wrote:
> 
> > On Tue, 20 Feb 2018 19:45:01 +0100
> > Claudio Imbrenda <address@hidden> wrote:

> > > diff --git a/include/hw/s390x/event-facility.h
> > > b/include/hw/s390x/event-facility.h index 5119b9b..0a8b47a 100644
> > > --- a/include/hw/s390x/event-facility.h
> > > +++ b/include/hw/s390x/event-facility.h
> > > @@ -28,12 +28,14 @@
> > >  #define SCLP_EVENT_SIGNAL_QUIESCE               0x1d
> > >  
> > >  /* SCLP event masks */
> > > -#define SCLP_EVENT_MASK_SIGNAL_QUIESCE          0x00000008
> > > -#define SCLP_EVENT_MASK_MSG_ASCII               0x00000040
> > > -#define SCLP_EVENT_MASK_CONFIG_MGT_DATA         0x10000000
> > > -#define SCLP_EVENT_MASK_OP_CMD                  0x80000000
> > > -#define SCLP_EVENT_MASK_MSG                     0x40000000
> > > -#define SCLP_EVENT_MASK_PMSGCMD                 0x00800000
> > > +#define SCLPEVMSK(T)  (1ULL << (sizeof(sccb_mask_t) * 8 - (T)))    
> > 
> > SCLP_EVMASK() would be a bit more readable, I think.  
> 
> I know, but then it looks ugly when trying to fit everything in 80
> columns. 

I'd rather go slightly over 80 in that case (as long as you don't cross
90).

> 
> > > +
> > > +#define SCLP_EVENT_MASK_OP_CMD
> > > SCLPEVMSK(SCLP_EVENT_OPRTNS_COMMAND) +#define
> > > SCLP_EVENT_MASK_MSG             SCLPEVMSK(SCLP_EVENT_MESSAGE)
> > > +#define SCLP_EVENT_MASK_CONFIG_MGT_DATA
> > > SCLPEVMSK(SCLP_EVENT_CONFIG_MGT_DATA) +#define
> > > SCLP_EVENT_MASK_PMSGCMD         SCLPEVMSK(SCLP_EVENT_PMSGCMD)
> > > +#define SCLP_EVENT_MASK_MSG_ASCII
> > > SCLPEVMSK(SCLP_EVENT_ASCII_CONSOLE_DATA) +#define
> > > SCLP_EVENT_MASK_SIGNAL_QUIESCE
> > > SCLPEVMSK(SCLP_EVENT_SIGNAL_QUIESCE) #define
> > > SCLP_UNCONDITIONAL_READ                 0x00 #define
> > > SCLP_SELECTIVE_READ                     0x01    
> >   
>