From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=45657 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PuAUT-0002OP-TN for qemu-devel@nongnu.org; Mon, 28 Feb 2011 16:18:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PuAUR-0003to-FG for qemu-devel@nongnu.org; Mon, 28 Feb 2011 16:18:49 -0500 Received: from fmmailgate01.web.de ([217.72.192.221]:41693) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PuAUR-0003tg-1n for qemu-devel@nongnu.org; Mon, 28 Feb 2011 16:18:47 -0500 Message-ID: <4D6C1130.10409@web.de> Date: Mon, 28 Feb 2011 22:18:40 +0100 From: Jan Kiszka MIME-Version: 1.0 References: <20110228104901.GE10873@yookeroo> In-Reply-To: <20110228104901.GE10873@yookeroo> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig02773BF41F27C6FE25195129" Sender: jan.kiszka@web.de Subject: [Qemu-devel] Re: Fix build breakage to kvm on ppc List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: David Gibson Cc: agraf@suse.de, qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig02773BF41F27C6FE25195129 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 2011-02-28 11:49, David Gibson wrote: > Recent changes to the generic kvm support code broke compile of kvm > for ppc. The patch below fixes the errors by adjusting types in the > ppc code, and adding a missing #ifdef. >=20 > Please apply. >=20 > Signed-off-by: David Gibson >=20 > --- > kvm-all.c | 2 ++ > target-ppc/kvm.c | 6 +++--- > 2 files changed, 5 insertions(+), 3 deletions(-) >=20 > diff --git a/kvm-all.c b/kvm-all.c > index e6a7de4..fb44e2e 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -998,7 +998,9 @@ int kvm_cpu_exec(CPUState *env) > } > ret =3D EXCP_INTERRUPT; > =20 > +#ifdef KVM_CAP_SET_GUEST_DEBUG > out: > +#endif /* KVM_CAP_SET_GUEST_DEBUG */ Yeah, another non-x86 breakage. But this made me think about the main loop again, and the result will move any related reasons for the #ifdef into arch code. > env->exit_request =3D 0; > cpu_single_env =3D NULL; > return ret; > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c > index 04b94a3..4fa1be3 100644 > --- a/target-ppc/kvm.c > +++ b/target-ppc/kvm.c > @@ -223,7 +223,7 @@ int kvmppc_set_interrupt(CPUState *env, int irq, in= t level) > #define PPC_INPUT_INT PPC6xx_INPUT_INT > #endif > =20 > -int kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > +void kvm_arch_pre_run(CPUState *env, struct kvm_run *run) > { > int r; > unsigned irq; > @@ -254,15 +254,15 @@ int kvm_arch_pre_run(CPUState *env, struct kvm_ru= n *run) > /* We don't know if there are more interrupts pending after this. = However, > * the guest will return to userspace in the course of handling th= is one > * anyways, so we will get a chance to deliver the rest. */ > - return 0; > } > =20 > void kvm_arch_post_run(CPUState *env, struct kvm_run *run) > { > } > =20 > -void kvm_arch_process_irqchip_events(CPUState *env) > +int kvm_arch_process_irqchip_events(CPUState *env) > { > + return 0; > } > =20 > static int kvmppc_handle_halt(CPUState *env) >=20 That other fix is already filed for uq/master. Thanks for reporting, Jan --------------enig02773BF41F27C6FE25195129 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk1sETQACgkQitSsb3rl5xQFlACfWlyzzA4kQ1HEO3esBSbzeQVz gdUAoLHKltdzPjcV8R+bvRNW0tMsZrzO =3HXZ -----END PGP SIGNATURE----- --------------enig02773BF41F27C6FE25195129--