[Qemu-devel] [PATCH] Revert "nand: Don't inherit from Sysbus"

[Markus Armbruster <armbru@redhat.com>]

This reverts commit 7426aa72c36c908a7d0eae3e38568bb0a70de479.

The commit goes into a sensible direction, but it violates qdev design
assumptions.  Symptom: "info qtree" crashes for all boards including
the device (akita, borzoi, spitz, terrier, tosa, axis-dev88).

Peter Crosthwaite is working on a fix, but it's not trivial.  Revert
the flawed patch for now.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
---
 hw/block/nand.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/hw/block/nand.c b/hw/block/nand.c
index a871ce0..a0232d1 100644
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -21,7 +21,7 @@
 # include "hw/hw.h"
 # include "hw/block/flash.h"
 # include "sysemu/blockdev.h"
-#include "hw/qdev.h"
+# include "hw/sysbus.h"
 #include "qemu/error-report.h"
 
 # define NAND_CMD_READ0		0x00
@@ -54,8 +54,7 @@
 
 typedef struct NANDFlashState NANDFlashState;
 struct NANDFlashState {
-    DeviceState parent_obj;
-
+    SysBusDevice busdev;
     uint8_t manf_id, chip_id;
     uint8_t buswidth; /* in BYTES */
     int size, pages;
@@ -441,7 +440,7 @@ static void nand_class_init(ObjectClass *klass, void *data)
 
 static const TypeInfo nand_info = {
     .name          = TYPE_NAND,
-    .parent        = TYPE_DEVICE,
+    .parent        = TYPE_SYS_BUS_DEVICE,
     .instance_size = sizeof(NANDFlashState),
     .class_init    = nand_class_init,
 };
-- 
1.8.1.4