From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQyZ5-0007qI-Py for qemu-devel@nongnu.org; Tue, 01 Oct 2013 07:56:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQyZ1-0004Fy-8O for qemu-devel@nongnu.org; Tue, 01 Oct 2013 07:56:31 -0400 Received: from cantor2.suse.de ([195.135.220.15]:51338 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQyZ0-0004Dc-VI for qemu-devel@nongnu.org; Tue, 01 Oct 2013 07:56:27 -0400 Message-ID: <524AB866.2010801@suse.de> Date: Tue, 01 Oct 2013 13:56:22 +0200 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1375626131-6857-1-git-send-email-afaerber@suse.de> <87pprpz71a.fsf@blackfin.pond.sub.org> In-Reply-To: <87pprpz71a.fsf@blackfin.pond.sub.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-next for-next 0/5] QOM PCMCIA, MicroDrive and IDE cleanups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Kevin Wolf , Othmar Pasteka , qemu-devel@nongnu.org, Anthony Liguori , Peter Maydell Am 01.10.2013 11:15, schrieb Markus Armbruster: > Has this one fallen through the cracks? Nobody, including yourself, has felt responsable for reviewing this, and I wanted to get some form of test coverage in place before sending any pull, which I have just applied yesterday. :-) It has been rebased without problems all the time. Andreas > Andreas F=C3=A4rber writes: >=20 >> Hello, >> >> Based on an initial draft from Othmar Pasteka, this series QOM'ifies M= icroDrive. >> As a prerequisite, PCMCIA must be QOM'ified as pointed out by Peter. W= e can then >> finally drop ide_init2_with_non_qdev_drives(), as desired by Markus fo= r his >> IDE refactorings. As a final touch, pxa2xx_pcmcia is made a SysBusDevi= ce. >> >> A for-1.6 patch to fix an assertion while inspecting the QOM compositi= on tree >> was sent out separately. >> >> QOM'ifying the PXA2xx SoCs to replace pxa2xx_pcmcia_init() and other h= elpers >> is left as follow-up. >> >> We probably also want to move "info pcmcia" HMP out of vl.c but I'm no= t sure >> in which form we want to keep PCMCIASocket? A SysBusDevice subtype wou= ld seem >> easiest for our current use case, but there are also PCI-CardBus bridg= es IIRC. >> PCMCIASocket::card_string should probably be a property of PCMCIACardS= tate, >> accessed through a link property. >> >> Markus, unfortunately git am --3way didn't work for your old IDE patch= es. >> Please rebase them on this series yourself, thanks. >> >> Regards, >> Andreas >> >> >From Othmar's draft patch: >> * Dropped unused MicroDriveClass. >> * Kept IRQ allocation where it was - it's ugly either way. >> * Rebased onto ide_bus_new() change: 1 slot, so 1 IDE device. >> * Updated dscm1xxxx_init() to use the new QOM type. >> * Distinguished between microdrive and dscm1xxxx types. >> * QOM'ified PCMCIA and made MicroDrive a PCMCIA Card rather than SysBu= sDevice. >> * Fixed typo in PXA2xx API. >> * QOM'ified PXA2xx PCMCIA controller. >> >> >From Markus' IDE series: >> * Instead of breaking ide_init2_with_non_qdev_drives(), dropped it aft= er >> converting last remaining pre-qdev IDE device. >> >> Cc: Markus Armbruster >> Cc: Kevin Wolf >> Cc: Othmar Pesteka >> Cc: Peter Maydell >> Cc: Anthony Liguori >> >> Andreas F=C3=A4rber (5): >> pxa: Fix typo "dettach" >> pcmcia: QOM'ify PCMCIACardState and MicroDriveState >> microdrive: Coding Style cleanups >> ide: Drop ide_init2_with_non_qdev_drives() >> pcmcia/pxa2xx: QOM'ify PXA2xxPCMCIAState >> >> hw/Makefile.objs | 1 + >> hw/ide/core.c | 49 ------ >> hw/ide/internal.h | 2 - >> hw/ide/microdrive.c | 226 ++++++++++++++++++= +-------- >> hw/misc/Makefile.objs | 1 - >> hw/pcmcia/Makefile.objs | 2 + >> hw/pcmcia/pcmcia.c | 24 +++ >> hw/{misc/pxa2xx_pcmcia.c =3D> pcmcia/pxa2xx.c} | 130 +++++++++++---- >> include/hw/arm/pxa.h | 2 +- >> include/hw/pcmcia.h | 46 ++++-- >> 10 files changed, 322 insertions(+), 161 deletions(-) >> create mode 100644 hw/pcmcia/Makefile.objs >> create mode 100644 hw/pcmcia/pcmcia.c >> rename hw/{misc/pxa2xx_pcmcia.c =3D> pcmcia/pxa2xx.c} (61%) --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg