From: Efimov Vasily Date: Wed, 22 Jun 2016 12:24:48 +0000 (+0300) Subject: pflash: make TYPE_CFI_PFLASH0{1,2} macros public X-Git-Tag: v2.7.0-rc0~75^2~31 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a004c7fc8d9c9a4a4eb71b5717181f6fe5cf636;p=thirdparty%2Fqemu.git pflash: make TYPE_CFI_PFLASH0{1,2} macros public 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 Reviewed-by: Paolo Bonzini Signed-off-by: Paolo Bonzini --- diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c index 31585e3aa16..62d7a5661d4 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 5f106102c54..4f6105cc58b 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 50ccbbcf135..a088baa4e4a 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 */