From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36644) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQw3F-0003zS-GU for qemu-devel@nongnu.org; Tue, 01 Oct 2013 05:15:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VQw3A-0004Dc-6U for qemu-devel@nongnu.org; Tue, 01 Oct 2013 05:15:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:59447) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VQw39-0004CR-Uj for qemu-devel@nongnu.org; Tue, 01 Oct 2013 05:15:24 -0400 From: Markus Armbruster References: <1375626131-6857-1-git-send-email-afaerber@suse.de> Date: Tue, 01 Oct 2013 11:15:13 +0200 In-Reply-To: <1375626131-6857-1-git-send-email-afaerber@suse.de> ("Andreas =?utf-8?Q?F=C3=A4rber=22's?= message of "Sun, 4 Aug 2013 16:22:06 +0200") Message-ID: <87pprpz71a.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 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: Andreas =?utf-8?Q?F=C3=A4rber?= Cc: Kevin Wolf , Othmar Pasteka , qemu-devel@nongnu.org, Anthony Liguori , Peter Maydell Has this one fallen through the cracks? Andreas F=C3=A4rber writes: > Hello, > > Based on an initial draft from Othmar Pasteka, this series QOM'ifies Micr= oDrive. > As a prerequisite, PCMCIA must be QOM'ified as pointed out by Peter. We c= an then > finally drop ide_init2_with_non_qdev_drives(), as desired by Markus for h= is > IDE refactorings. As a final touch, pxa2xx_pcmcia is made a SysBusDevice. > > A for-1.6 patch to fix an assertion while inspecting the QOM composition = tree > was sent out separately. > > QOM'ifying the PXA2xx SoCs to replace pxa2xx_pcmcia_init() and other help= ers > is left as follow-up. > > We probably also want to move "info pcmcia" HMP out of vl.c but I'm not s= ure > in which form we want to keep PCMCIASocket? A SysBusDevice subtype would = seem > easiest for our current use case, but there are also PCI-CardBus bridges = IIRC. > PCMCIASocket::card_string should probably be a property of PCMCIACardStat= e, > accessed through a link property. > > Markus, unfortunately git am --3way didn't work for your old IDE patches. > 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 SysBusDe= vice. > * 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 after > 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%)