From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50248) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5Miq-0000Lv-R5 for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V5Mik-0007gw-LB for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:16 -0400 Received: from cantor2.suse.de ([195.135.220.15]:33274 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V5Mik-0007ge-CP for qemu-devel@nongnu.org; Fri, 02 Aug 2013 17:17:10 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 2 Aug 2013 23:16:57 +0200 Message-Id: <1375478221-22722-3-git-send-email-afaerber@suse.de> In-Reply-To: <1375478221-22722-1-git-send-email-afaerber@suse.de> References: <1375478221-22722-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next for-next 2/6] ipack: QOM parent field cleanup for IPackBus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alberto Garcia , =?UTF-8?q?Andreas=20F=C3=A4rber?= Clean up the only user of IPackBus::qbus field and rename it. Signed-off-by: Andreas F=C3=A4rber --- 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 =3D n_slots; bus->set_irq =3D 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) =20 struct IPackBus { - BusState qbus; + /*< private >*/ + BusState parent_obj; + /* All fields are private */ uint8_t n_slots; uint8_t free_slot; --=20 1.8.1.4