From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53201) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcy-0002OI-RO for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WFWcp-00066U-Ac for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:28 -0500 Received: from cantor2.suse.de ([195.135.220.15]:41652 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WFWcp-00064d-5R for qemu-devel@nongnu.org; Mon, 17 Feb 2014 17:25:19 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id F0253AC92 for ; Mon, 17 Feb 2014 22:25:18 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 17 Feb 2014 23:24:41 +0100 Message-Id: <1392675899-21210-32-git-send-email-afaerber@suse.de> In-Reply-To: <1392675899-21210-1-git-send-email-afaerber@suse.de> References: <1392675899-21210-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] [PULL v2 31/49] ipack: QOM parent field cleanup for IPackDevice 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?= Rename the IPackDevice::qdev field to avoid accidental use. Acked-by: Alberto Garcia Signed-off-by: Andreas F=C3=A4rber --- hw/char/ipack.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/char/ipack.h b/hw/char/ipack.h index a386b88..e95ffe8 100644 --- a/hw/char/ipack.h +++ b/hw/char/ipack.h @@ -64,7 +64,10 @@ struct IPackDeviceClass { }; =20 struct IPackDevice { - DeviceState qdev; + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + int32_t slot; /* IRQ objects for the IndustryPack INT0# and INT1# */ qemu_irq *irq; --=20 1.8.4.5