Convert the QOM PFlashCFI02 to a forward/opaque pointer declaration.
Only pflash_cfi02.c is able to poke at the internal fields.
Reviewed-by: Bin Meng <bmeng...@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
hw/block/pflash_cfi02.c | 2 ++
include/hw/block/flash.h | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index 6168e66d7e..ba035d8d42 100644
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -63,6 +63,8 @@ enum {
WCYCLE_AUTOSELECT_CFI = 8,
};
+OBJECT_DECLARE_SIMPLE_TYPE(PFlashCFI02, PFLASH_CFI02)
+
struct PFlashCFI02 {
/*< private >*/
SysBusDevice parent_obj;
diff --git a/include/hw/block/flash.h b/include/hw/block/flash.h
index d615bf6a53..aeec4a369b 100644
--- a/include/hw/block/flash.h
+++ b/include/hw/block/flash.h
@@ -6,9 +6,8 @@
#include "exec/hwaddr.h"
#include "qom/object.h"
-/* pflash_cfi01.c */
-
#define TYPE_PFLASH_CFI01 "cfi.pflash01"
+#define TYPE_PFLASH_CFI02 "cfi.pflash02"
OBJECT_DECLARE_SIMPLE_TYPE(PFlashCFI01, PFLASH_CFI01)
@@ -25,11 +24,6 @@ BlockBackend *pflash_cfi01_get_blk(DeviceState *dev);
MemoryRegion *pflash_cfi01_get_memory(DeviceState *dev);
void pflash_cfi01_legacy_drive(DeviceState *dev, DriveInfo *dinfo);
-/* pflash_cfi02.c */
-
-#define TYPE_PFLASH_CFI02 "cfi.pflash02"
-OBJECT_DECLARE_SIMPLE_TYPE(PFlashCFI02, PFLASH_CFI02)
-
/* nand.c */
DeviceState *nand_init(BlockBackend *blk, int manf_id, int chip_id);
--
2.38.1
