On 2011-06-10 20:32, Eduardo Habkost wrote:
> On Wed, Jun 08, 2011 at 04:11:03PM +0200, Jan Kiszka wrote:
> <snip>
>> @@ -217,7 +209,6 @@ int kvm_arch_get_registers(CPUState *env)
>> return ret;
>> }
>>
>> -#ifdef KVM_CAP_PPC_BOOKE_SREGS
>> if (sregs.u.e.features & KVM_SREGS_E_BASE) {
>> env->spr[SPR_BOOKE_CSRR0] = sregs.u.e.csrr0;
>> env->spr[SPR_BOOKE_CSRR1] = sregs.u.e.csrr1;
>
> 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).
>
> 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
Attachment:
signature.asc
Description: OpenPGP digital signature
