From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57449)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UoIiV-0001BO-VW
	for qemu-devel@nongnu.org; Sun, 16 Jun 2013 15:34:24 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1UoIiV-0005ni-1b
	for qemu-devel@nongnu.org; Sun, 16 Jun 2013 15:34:23 -0400
Message-ID: <51BE133A.4030909@suse.de>
Date: Sun, 16 Jun 2013 21:34:18 +0200
From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1371069171-20377-1-git-send-email-scottwood@freescale.com>
	<1371407574-9386-1-git-send-email-afaerber@suse.de>
In-Reply-To: <1371407574-9386-1-git-send-email-afaerber@suse.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH ppc-next fixup] intc/openpic_kvm: Fix QOM
 and build issues
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: Scott Wood <scottwood@freescale.com>, qemu-ppc@nongnu.org, qemu-devel@nongnu.org

Am 16.06.2013 20:32, schrieb Andreas F=C3=A4rber:
> Signed-off-by: Andreas F=C3=A4rber <afaerber@suse.de>
> ---
>  default-configs/ppcemb-softmmu.mak |  1 +
>  hw/intc/openpic_kvm.c              | 50 +++++++++++++++++++++++-------=
--------
>  hw/ppc/e500.c                      |  2 +-
>  include/hw/ppc/openpic.h           |  1 +
>  4 files changed, 34 insertions(+), 20 deletions(-)
>=20
> diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcem=
b-softmmu.mak
> index be93e03..97be9f6 100644
> --- a/default-configs/ppcemb-softmmu.mak
> +++ b/default-configs/ppcemb-softmmu.mak
> @@ -38,5 +38,6 @@ CONFIG_XILINX=3Dy
>  CONFIG_XILINX_ETHLITE=3Dy
>  CONFIG_OPENPIC=3Dy
>  CONFIG_E500=3D$(CONFIG_FDT)
> +CONFIG_OPENPIC_KVM=3D$(and $(CONFIG_E500),$(CONFIG_KVM))
>  # For PReP
>  CONFIG_MC146818RTC=3Dy
> diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
> index 17d0a35..8818b5d 100644
> --- a/hw/intc/openpic_kvm.c
> +++ b/hw/intc/openpic_kvm.c
> @@ -31,8 +31,14 @@
>  #include "sysemu/kvm.h"
>  #include "qemu/log.h"
> =20
> +#define KVM_OPENPIC(obj) \
> +    OBJECT_CHECK(KVMOpenPICState, (obj), TYPE_KVM_OPENPIC)
> +
>  typedef struct KVMOpenPICState {
> +    /*< private >*/
>      SysBusDevice busdev;

Missed the field name, hiding another occurrence of FROM_SYSBUS() in
kvm_openpic_connect_vcpu(). v2 sent.

Andreas

> +    /*< public >*/
> +
>      MemoryRegion mem;
>      MemoryListener mem_listener;
>      uint32_t fd;
[snip]

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