From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:41993) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QVIt0-0007UI-TV for qemu-devel@nongnu.org; Sat, 11 Jun 2011 03:45:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QVIsz-0005s0-Jk for qemu-devel@nongnu.org; Sat, 11 Jun 2011 03:45:38 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:40456) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QVIsz-0005ru-7w for qemu-devel@nongnu.org; Sat, 11 Jun 2011 03:45:37 -0400 Message-ID: <4DF31D14.7060500@web.de> Date: Sat, 11 Jun 2011 09:45:24 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <95341919f37374d98bbcd7ee5991b779011fba20.1307542247.git.jan.kiszka@siemens.com> <20110610183250.GF5205@otherpad.lan.raisama.net> In-Reply-To: <20110610183250.GF5205@otherpad.lan.raisama.net> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigA32726B5EE19067CC649EA0E" Sender: jan.kiszka@web.de Subject: Re: [Qemu-devel] [PATCH 09/12] kvm: ppc: Drop KVM_CAP build dependencies List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Avi Kivity , Marcelo Tosatti , qemu-devel@nongnu.org, kvm@vger.kernel.org, Alexander Graf This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigA32726B5EE19067CC649EA0E Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 2011-06-10 20:32, Eduardo Habkost wrote: > On Wed, Jun 08, 2011 at 04:11:03PM +0200, Jan Kiszka wrote: > >> @@ -217,7 +209,6 @@ int kvm_arch_get_registers(CPUState *env) >> return ret; >> } >> =20 >> -#ifdef KVM_CAP_PPC_BOOKE_SREGS >> if (sregs.u.e.features & KVM_SREGS_E_BASE) { >> env->spr[SPR_BOOKE_CSRR0] =3D sregs.u.e.csrr0; >> env->spr[SPR_BOOKE_CSRR1] =3D sregs.u.e.csrr1; >=20 > Which tree/commit-id did you use as base for this series? This chunk > doesn't apply on uq/master (patch 11/12, on the other hand, doesn't > apply against qemu.git/master, only uq/master). >=20 > After some patch hunting, I found out that the series apply cleanly if = I > apply it against a manual merge of uq/master and qemu.git/master, but > maybe there is a branch that already had all the dependencies, that I > didn't know about? As I wrote in the introduction, the series requires a trivial rebase of uq/master over current qemu master (because of this patch). Jan --------------enigA32726B5EE19067CC649EA0E 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/ iEYEARECAAYFAk3zHRkACgkQitSsb3rl5xS/5gCcDQ4hbTOE3TYqOlAsG5pqoUHr XT4An3McnqC/JinIwyOOghZ9ArkmwALc =ig7i -----END PGP SIGNATURE----- --------------enigA32726B5EE19067CC649EA0E--