From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:43899)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1Sc3Yo-00078D-73
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:54:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1Sc3UT-00018w-Ui
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:53:13 -0400
Received: from cantor2.suse.de ([195.135.220.15]:36336 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1Sc3UT-00018U-Nw
	for qemu-devel@nongnu.org; Tue, 05 Jun 2012 19:48:45 -0400
Message-ID: <4FCE9AD3.1080306@suse.de>
Date: Wed, 06 Jun 2012 01:48:35 +0200
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1338880564-12277-1-git-send-email-jfrei@linux.vnet.ibm.com>
In-Reply-To: <1338880564-12277-1-git-send-email-jfrei@linux.vnet.ibm.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH] Fix build of kvm-all.c when no
	KVM_CAP_IRQ_ROUTING
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: Jens Freimann <jfrei@linux.vnet.ibm.com>
Cc: Jan Kiszka <jan.kiszka@siemens.com>, qemu-devel@nongnu.org

Am 05.06.2012 09:16, schrieb Jens Freimann:
> In kvm-all.c an #ifdef KVM_CAP_IRQ_ROUTING was missing in two
> places which broke the build when this capability is not enabled.
> Found when building the s390-softmmu target.
>=20
> Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>

A patch by Jan moves the first chunk instead and fixes another issue as
well in v2. Cc'ing Jan to verify.

Andreas

> ---
>  kvm-all.c |    4 ++++
>  1 file changed, 4 insertions(+)
>=20
> diff --git a/kvm-all.c b/kvm-all.c
> index 489ee53..95634ef 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -62,10 +62,12 @@ typedef struct KVMSlot
> =20
>  typedef struct kvm_dirty_log KVMDirtyLog;
> =20
> +#ifdef KVM_CAP_IRQ_ROUTING
>  typedef struct KVMMSIRoute {
>      struct kvm_irq_routing_entry kroute;
>      QTAILQ_ENTRY(KVMMSIRoute) entry;
>  } KVMMSIRoute;
> +#endif
> =20
>  struct KVMState
>  {
> @@ -1286,7 +1288,9 @@ int kvm_init(void)
>      s->pit_state2 =3D kvm_check_extension(s, KVM_CAP_PIT_STATE2);
>  #endif
> =20
> +#ifdef KVM_CAP_IRQ_ROUTING
>      s->direct_msi =3D (kvm_check_extension(s, KVM_CAP_SIGNAL_MSI) > 0)=
;
> +#endif
> =20
>      ret =3D kvm_arch_init(s);
>      if (ret < 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