On 17/06/2016 15:11, Efimov Vasily wrote: > qdev API can be used to create CFI pflash devices despite existance of helper > functions. The type name is needed in course of such creation. Using the > preprocessor alias instead of the string literal itself is preferable. > > The patch makes the aliases accessible through the header. > > Signed-off-by: Efimov Vasily <r...@ispras.ru> > --- > hw/block/pflash_cfi01.c | 1 - > hw/block/pflash_cfi02.c | 1 - > include/hw/block/flash.h | 3 +++ > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c > index 31585e3..62d7a56 100644 > --- a/hw/block/pflash_cfi01.c > +++ b/hw/block/pflash_cfi01.c > @@ -65,7 +65,6 @@ do { > \ > #define DPRINTF(fmt, ...) do { } while (0) > #endif > > -#define TYPE_CFI_PFLASH01 "cfi.pflash01" > #define CFI_PFLASH01(obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH01) > > #define PFLASH_BE 0 > diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c > index 5f10610..4f6105c 100644 > --- a/hw/block/pflash_cfi02.c > +++ b/hw/block/pflash_cfi02.c > @@ -57,7 +57,6 @@ do { \ > > #define PFLASH_LAZY_ROMD_THRESHOLD 42 > > -#define TYPE_CFI_PFLASH02 "cfi.pflash02" > #define CFI_PFLASH02(obj) OBJECT_CHECK(pflash_t, (obj), TYPE_CFI_PFLASH02) > > struct pflash_t { > diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h > index 50ccbbc..a088baa 100644 > --- a/include/hw/block/flash.h > +++ b/include/hw/block/flash.h > @@ -5,6 +5,9 @@ > > #include "exec/memory.h" > > +#define TYPE_CFI_PFLASH01 "cfi.pflash01" > +#define TYPE_CFI_PFLASH02 "cfi.pflash02" > + > typedef struct pflash_t pflash_t; > > /* pflash_cfi01.c */ >
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>