From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:56931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rio3g-0006LN-Rn for qemu-devel@nongnu.org; Thu, 05 Jan 2012 09:12:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rio3f-0001bg-Cv for qemu-devel@nongnu.org; Thu, 05 Jan 2012 09:12:44 -0500 Received: from cantor2.suse.de ([195.135.220.15]:38374 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rio3f-0001bZ-59 for qemu-devel@nongnu.org; Thu, 05 Jan 2012 09:12:43 -0500 Message-ID: <4F05AF80.3070405@suse.de> Date: Thu, 05 Jan 2012 15:11:12 +0100 From: =?ISO-8859-15?Q?Andreas_F=E4rber?= MIME-Version: 1.0 References: <1325771559-15570-1-git-send-email-mark.langsdorf@calxeda.com> In-Reply-To: <1325771559-15570-1-git-send-email-mark.langsdorf@calxeda.com> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 1/2] ahci: convert ahci_reset to use AHCIState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Mark Langsdorf Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org, Rob Herring , Alexander Graf Am 05.01.2012 14:52, schrieb Mark Langsdorf: > From: Rob Herring >=20 > Use AHCIState instead of AHCIPCIState so the function can be used for > non-PCI based AHCI controllers. >=20 > Signed-off-by: Rob Herring > Signed-off-by: Mark Langsdorf Reviewed-by: Andreas F=E4rber Andreas > --- > Changes from v1, v2 > None >=20 > hw/ide/ahci.c | 14 +++++++------- > hw/ide/ich.c | 4 ++-- > 2 files changed, 9 insertions(+), 9 deletions(-) >=20 > diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c > index 0af201d..135d0ee 100644 > --- a/hw/ide/ahci.c > +++ b/hw/ide/ahci.c > @@ -336,7 +336,7 @@ static void ahci_mem_write(void *opaque, target_phy= s_addr_t addr, > case HOST_CTL: /* R/W */ > if (val & HOST_CTL_RESET) { > DPRINTF(-1, "HBA Reset\n"); > - ahci_reset(container_of(s, AHCIPCIState, ahci)); > + ahci_reset(s); > } else { > s->control_regs.ghc =3D (val & 0x3) | HOST_CTL_AHC= I_EN; > ahci_check_irq(s); > @@ -1199,18 +1199,18 @@ void ahci_uninit(AHCIState *s) > =20 > void ahci_reset(void *opaque) > { > - struct AHCIPCIState *d =3D opaque; > + struct AHCIState *s =3D opaque; > AHCIPortRegs *pr; > int i; > =20 > - d->ahci.control_regs.irqstatus =3D 0; > - d->ahci.control_regs.ghc =3D 0; > + s->control_regs.irqstatus =3D 0; > + s->control_regs.ghc =3D 0; > =20 > - for (i =3D 0; i < d->ahci.ports; i++) { > - pr =3D &d->ahci.dev[i].port_regs; > + for (i =3D 0; i < s->ports; i++) { > + pr =3D &s->dev[i].port_regs; > pr->irq_stat =3D 0; > pr->irq_mask =3D 0; > pr->scr_ctl =3D 0; > - ahci_reset_port(&d->ahci, i); > + ahci_reset_port(s, i); > } > } > diff --git a/hw/ide/ich.c b/hw/ide/ich.c > index 3f7510f..44363ec 100644 > --- a/hw/ide/ich.c > +++ b/hw/ide/ich.c > @@ -102,7 +102,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev) > /* XXX Software should program this register */ > d->card.config[0x90] =3D 1 << 6; /* Address Map Register - AHCI = mode */ > =20 > - qemu_register_reset(ahci_reset, d); > + qemu_register_reset(ahci_reset, &d->ahci); > =20 > msi_init(dev, 0x50, 1, true, false); > d->ahci.irq =3D d->card.irq[0]; > @@ -133,7 +133,7 @@ static int pci_ich9_uninit(PCIDevice *dev) > d =3D DO_UPCAST(struct AHCIPCIState, card, dev); > =20 > msi_uninit(dev); > - qemu_unregister_reset(ahci_reset, d); > + qemu_unregister_reset(ahci_reset, &d->ahci); > ahci_uninit(&d->ahci); > =20 > return 0; --=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