From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Twz8F-0007A1-Gv for qemu-devel@nongnu.org; Sun, 20 Jan 2013 12:56:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Twz85-00027R-Av for qemu-devel@nongnu.org; Sun, 20 Jan 2013 12:56:35 -0500 Received: from cantor2.suse.de ([195.135.220.15]:34364 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Twz85-00027N-3v for qemu-devel@nongnu.org; Sun, 20 Jan 2013 12:56:25 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 20 Jan 2013 18:56:18 +0100 Message-Id: <1358704579-15210-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 for-1.4?] isa: QOM'ify isa_bus_from_device() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori DeviceState::parent_bus is document as private and should be accessed through qdev_get_parent_bus(). Use a DEVICE() cast instead of accessing ISADevice's qdev field directly. Use ISA_BUS() in place of DO_UPCAST(). Signed-off-by: Andreas F=C3=A4rber Cc: Anthony Liguori --- hw/isa.h | 2 +- 1 Datei ge=C3=A4ndert, 1 Zeile hinzugef=C3=BCgt(+), 1 Zeile entfernt(-) diff --git a/hw/isa.h b/hw/isa.h index 62e89d3..7a8874a 100644 --- a/hw/isa.h +++ b/hw/isa.h @@ -82,7 +82,7 @@ void isa_register_portio_list(ISADevice *dev, uint16_t = start, =20 static inline ISABus *isa_bus_from_device(ISADevice *d) { - return DO_UPCAST(ISABus, qbus, d->qdev.parent_bus); + return ISA_BUS(qdev_get_parent_bus(DEVICE(d))); } =20 extern hwaddr isa_mem_base; --=20 1.7.10.4