Re: [PATCH 39/63] esp: Rename ESP_STATE to ESP

[Eduardo Habkost]

On Thu, Sep 03, 2020 at 03:01:33PM +0200, Philippe Mathieu-Daudé wrote:
> On 9/3/20 12:42 AM, Eduardo Habkost wrote:
> > Make the type checking macro name consistent with the TYPE_*
> > constant.
> > 
> > Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> > ---
> > Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> > Cc: Laurent Vivier <laurent@vivier.eu>
> > Cc: "Hervé Poussineau" <hpoussin@reactos.org>
> > Cc: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> > Cc: Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>
> > Cc: Aurelien Jarno <aurelien@aurel32.net>
> > Cc: Jiaxun Yang <jiaxun.yang@flygoat.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: Fam Zheng <fam@euphon.net>
> > Cc: Artyom Tarasenko <atar4qemu@gmail.com>
> > Cc: qemu-devel@nongnu.org
> > ---
> >  include/hw/scsi/esp.h | 2 +-
> >  hw/dma/sparc32_dma.c  | 2 +-
> >  hw/m68k/q800.c        | 2 +-
> >  hw/mips/jazz.c        | 2 +-
> >  hw/scsi/esp.c         | 6 +++---
> >  hw/sparc/sun4m.c      | 2 +-
> >  6 files changed, 8 insertions(+), 8 deletions(-)
> > 
> > diff --git a/include/hw/scsi/esp.h b/include/hw/scsi/esp.h
> > index f281625dd5..20800dbf5b 100644
> > --- a/include/hw/scsi/esp.h
> > +++ b/include/hw/scsi/esp.h
> > @@ -67,7 +67,7 @@ struct ESPState {
> >  
> >  #define TYPE_ESP "esp"
> >  typedef struct SysBusESPState SysBusESPState;
> > -DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP_STATE,
> > +DECLARE_INSTANCE_CHECKER(SysBusESPState, ESP,
> >                           TYPE_ESP)
> 
> "ESPDMA" would less likely clash with eventual 'ESP' definition.

I want to make the changes less intrusive as possible.  If the
macro is already called ESP and the type name string is already
"esp", I will just keep the existing naming.

-- 
Eduardo