From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52708) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCE35-00048D-Bo for qemu-devel@nongnu.org; Sat, 08 Feb 2014 14:58:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCE30-0002id-1o for qemu-devel@nongnu.org; Sat, 08 Feb 2014 14:58:47 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47061 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCE2z-0002iU-Qo for qemu-devel@nongnu.org; Sat, 08 Feb 2014 14:58:41 -0500 Message-ID: <52F68C6B.2080908@suse.de> Date: Sat, 08 Feb 2014 20:58:35 +0100 From: =?ISO-8859-1?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1375478221-22722-1-git-send-email-afaerber@suse.de> <20130806084837.GA5268@igalia.com> In-Reply-To: <20130806084837.GA5268@igalia.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next for-next 0/6] QOM realize for IndustryPack List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alberto Garcia , Paolo Bonzini Cc: Peter Maydell , Juan Quintela , qemu-devel@nongnu.org, "Michael S. Tsirkin" Am 06.08.2013 10:48, schrieb Alberto Garcia: > On Fri, Aug 02, 2013 at 11:16:55PM +0200, Andreas F=E4rber wrote: >=20 >> This series converts IndustryPack devices to QOM realize/unrealize. >> >> It goes on to clean up file placement, promoting IndustryPack to use >> its own subdirectory like PCI, ISA, virtio, etc. >=20 >> Andreas F=E4rber (6): >> ipack: Convert to QOM realize >> ipack: QOM parent field cleanup for IPackBus >> ipack: QOM parent field cleanup for IPackDevice I've now applied these three to qom-next. >> ipack: Simplify VMSTATE_IPACK_DEVICE() macro mst disliked the according change for a PCI VMState macro, so I've not applied this; but my RFC VMState series has not received a lot of review either since then, in particular not from Juan, and I've just uncovered an issue with armv7m_nvic requiring a v2. I'll extend v2 to drop this macro completely. >> ipoctal232: QOM parent field cleanup Rebased on lack of preceding patch as follows: diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c index 6fe79da..99bab4d 100644 --- a/hw/char/ipoctal232.c +++ b/hw/char/ipoctal232.c @@ -155,7 +155,7 @@ static const VMStateDescription vmstate_ipoctal =3D { .minimum_version_id =3D 1, .minimum_version_id_old =3D 1, .fields =3D (VMStateField[]) { - VMSTATE_IPACK_DEVICE(dev, IPOctalState), + VMSTATE_IPACK_DEVICE(parent_obj, IPOctalState), VMSTATE_STRUCT_ARRAY(ch, IPOctalState, N_CHANNELS, 1, vmstate_scc2698_channel, SCC2698Channel), VMSTATE_STRUCT_ARRAY(blk, IPOctalState, N_BLOCKS, 1, >> ipack: Move IndustryPack out of hw/char/ There were unresolved IRC discussions with Paolo where exactly to place which IndustryPack files, so that this series has been lying around. Patch 03/06 makes it obvious that the header should live somewhere in include/ for documenting the base QOM type though. A minimally invasive alternative would be to move it from hw/char/ to include/hw/char/ - would that be acceptable for everyone as first step? The other issue was that while the ipoctal232 device is right in hw/char/, tpci200.c and ipack.[hc] have nothing to do with char devices - therefore this patch proposed hw/ipack/, matching drivers/ipack/ in Lin= ux. > Acked-by: Alberto Garcia https://github.com/afaerber/qemu-cpu/commits/qom-next Thanks, Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe= rg