From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55961) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WNu08-0007PY-Bf for qemu-devel@nongnu.org; Wed, 12 Mar 2014 21:00:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WNu02-00029B-Bw for qemu-devel@nongnu.org; Wed, 12 Mar 2014 21:00:00 -0400 Message-ID: <53210307.1080300@suse.de> Date: Thu, 13 Mar 2014 01:59:51 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1394410549-13751-1-git-send-email-afaerber@suse.de> <1394410549-13751-35-git-send-email-afaerber@suse.de> <5320ED88.6070409@suse.de> In-Reply-To: <5320ED88.6070409@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH qom-cpu v2 34/40] exec: Change cpu_abort() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Alexander Graf Cc: Peter Maydell , Jia Liu , Riku Voipio , Blue Swirl , Michael Walle , qemu-ppc , "Edgar E. Iglesias" , pbonzini@redhat.com, Guan Xuetao , Aurelien Jarno , Richard Henderson Am 13.03.2014 00:28, schrieb Andreas F=C3=A4rber: > Am 10.03.2014 01:15, schrieb Andreas F=C3=A4rber: >> Signed-off-by: Andreas F=C3=A4rber >=20 > The m68k assert patch requires the following on top: >=20 > diff --git a/target-m68k/translate.c b/target-m68k/translate.c > index dff1e58..cd66289 100644 > --- a/target-m68k/translate.c > +++ b/target-m68k/translate.c > @@ -2084,12 +2084,14 @@ DISAS_INSN(wddata) >=20 > DISAS_INSN(wdebug) > { > + M68kCPU *cpu =3D m68k_env_get_cpu(env); > + > if (IS_USER(s)) { > gen_exception(s, s->pc - 2, EXCP_PRIVILEGE); > return; > } > /* TODO: Implement wdebug. */ > - cpu_abort(env, "WDEBUG not implemented"); > + cpu_abort(CPU(cpu), "WDEBUG not implemented"); > } >=20 > DISAS_INSN(trap) > @@ -2463,14 +2465,18 @@ DISAS_INSN(fbcc) >=20 > DISAS_INSN(frestore) > { > + M68kCPU *cpu =3D m68k_env_get_cpu(env); > + > /* TODO: Implement frestore. */ > - cpu_abort(env, "FRESTORE not implemented"); > + cpu_abort(CPU(cpu), "FRESTORE not implemented"); > } >=20 > DISAS_INSN(fsave) > { > + M68kCPU *cpu =3D m68k_env_get_cpu(env); > + > /* TODO: Implement fsave. */ > - cpu_abort(env, "FSAVE not implemented"); > + cpu_abort(CPU(cpu), "FSAVE not implemented"); > } >=20 > static inline TCGv gen_mac_extract_word(DisasContext *s, TCGv val, int > upper) Further needs: diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c index 81ec959..9974b10 100644 --- a/target-ppc/kvm.c +++ b/target-ppc/kvm.c @@ -1504,7 +1504,6 @@ int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, i nt buf_len) void kvmppc_set_papr(PowerPCCPU *cpu) { - CPUPPCState *env =3D &cpu->env; CPUState *cs =3D CPU(cpu); struct kvm_enable_cap cap =3D {}; int ret; @@ -1513,7 +1512,7 @@ void kvmppc_set_papr(PowerPCCPU *cpu) ret =3D kvm_vcpu_ioctl(cs, KVM_ENABLE_CAP, &cap); if (ret) { - cpu_abort(env, "This KVM version does not support PAPR\n"); + cpu_abort(cs, "This KVM version does not support PAPR\n"); } /* Update the capability flag so we sync the right information @@ -1523,7 +1522,6 @@ void kvmppc_set_papr(PowerPCCPU *cpu) void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) { - CPUPPCState *env =3D &cpu->env; CPUState *cs =3D CPU(cpu); struct kvm_enable_cap cap =3D {}; int ret; @@ -1533,7 +1531,7 @@ void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) ret =3D kvm_vcpu_ioctl(cs, KVM_ENABLE_CAP, &cap); if (ret && mpic_proxy) { - cpu_abort(env, "This KVM version does not support EPR\n"); + cpu_abort(cs, "This KVM version does not support EPR\n"); } } Andreas --=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