Clean up the only user of IPackBus::qbus field and rename it.
Signed-off-by: Andreas Färber <afaer...@suse.de>
---
hw/char/ipack.c | 2 +-
hw/char/ipack.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/char/ipack.c b/hw/char/ipack.c
index a902fe4..0758fdd 100644
--- a/hw/char/ipack.c
+++ b/hw/char/ipack.c
@@ -28,7 +28,7 @@ void ipack_bus_new_inplace(IPackBus *bus, DeviceState *parent,
const char *name, uint8_t n_slots,
qemu_irq_handler handler)
{
- qbus_create_inplace(&bus->qbus, TYPE_IPACK_BUS, parent, name);
+ qbus_create_inplace(bus, TYPE_IPACK_BUS, parent, name);
bus->n_slots = n_slots;
bus->set_irq = handler;
}
diff --git a/hw/char/ipack.h b/hw/char/ipack.h
index 4286fc0..03b07f0 100644
--- a/hw/char/ipack.h
+++ b/hw/char/ipack.h
@@ -19,7 +19,9 @@ typedef struct IPackBus IPackBus;
#define IPACK_BUS(obj) OBJECT_CHECK(IPackBus, (obj), TYPE_IPACK_BUS)
struct IPackBus {
- BusState qbus;
+ /*< private >*/
+ BusState parent_obj;
+
/* All fields are private */
uint8_t n_slots;
uint8_t free_slot;
--
1.8.1.4
