From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:53818)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1T1afC-0007Uh-9e
	for qemu-devel@nongnu.org; Wed, 15 Aug 2012 06:17:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1T1afB-0004CX-2K
	for qemu-devel@nongnu.org; Wed, 15 Aug 2012 06:17:22 -0400
Message-ID: <502B772C.1060605@suse.de>
Date: Wed, 15 Aug 2012 12:17:16 +0200
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1345024742-18394-1-git-send-email-agraf@suse.de>
	<1345024742-18394-2-git-send-email-agraf@suse.de>
In-Reply-To: <1345024742-18394-2-git-send-email-agraf@suse.de>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH 01/24] pseries pci: removed redundant busdev
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Alexander Graf <agraf@suse.de>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>, qemu-devel qemu-devel <qemu-devel@nongnu.org>, Blue Swirl <blauwirbel@gmail.com>, qemu-ppc Mailing List <qemu-ppc@nongnu.org>, Anthony Liguori <anthony@codemonkey.ws>, Aurelien Jarno <aurelien@aurel32.net>

Am 15.08.2012 11:58, schrieb Alexander Graf:
> From: Alexey Kardashevskiy <aik@ozlabs.ru>
>=20
> The PCIHostState struct already contains SysBusDevice so
> the one in sPAPRPHBState has to go.
>=20
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> Signed-off-by: Alexander Graf <agraf@suse.de>

As mentioned, this patch conflicts with my spapr_pci patch in the
pci_host series that Anthony wanted to apply for 1.2.

Andreas

> ---
>  hw/spapr_pci.c |    4 ++--
>  hw/spapr_pci.h |    1 -
>  2 files changed, 2 insertions(+), 3 deletions(-)
>=20
> diff --git a/hw/spapr_pci.c b/hw/spapr_pci.c
> index b2e4f78..5bee180 100644
> --- a/hw/spapr_pci.c
> +++ b/hw/spapr_pci.c
> @@ -276,7 +276,7 @@ static DMAContext *spapr_pci_dma_context_fn(PCIBus =
*bus, void *opaque,
> =20
>  static int spapr_phb_init(SysBusDevice *s)
>  {
> -    sPAPRPHBState *phb =3D FROM_SYSBUS(sPAPRPHBState, s);
> +    sPAPRPHBState *phb =3D DO_UPCAST(sPAPRPHBState, host_state.busdev,=
 s);
>      char *namebuf;
>      int i;
>      PCIBus *bus;
> @@ -314,7 +314,7 @@ static int spapr_phb_init(SysBusDevice *s)
>      memory_region_add_subregion(get_system_memory(), phb->io_win_addr,
>                                  &phb->iowindow);
> =20
> -    bus =3D pci_register_bus(&phb->busdev.qdev,
> +    bus =3D pci_register_bus(&phb->host_state.busdev.qdev,
>                             phb->busname ? phb->busname : phb->dtbusnam=
e,
>                             pci_spapr_set_irq, pci_spapr_map_irq, phb,
>                             &phb->memspace, &phb->iospace,
> diff --git a/hw/spapr_pci.h b/hw/spapr_pci.h
> index d9e46e2..a141764 100644
> --- a/hw/spapr_pci.h
> +++ b/hw/spapr_pci.h
> @@ -28,7 +28,6 @@
>  #include "hw/xics.h"
> =20
>  typedef struct sPAPRPHBState {
> -    SysBusDevice busdev;
>      PCIHostState host_state;
> =20
>      uint64_t buid;
>=20


--=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