From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gleb Natapov Subject: Re: [PATCH qom-cpu for-1.4?] kvm: Pass CPUState to kvm_on_sigbus_vcpu() Date: Mon, 28 Jan 2013 15:50:48 +0200 Message-ID: <20130128135048.GD22871@redhat.com> References: <1359129329-21274-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: Marcelo Tosatti , qemu-devel@nongnu.org, "open list:Overall" To: Andreas =?utf-8?Q?F=C3=A4rber?= Return-path: Content-Disposition: inline In-Reply-To: <1359129329-21274-1-git-send-email-afaerber@suse.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org Sender: qemu-devel-bounces+gceq-qemu-devel=gmane.org@nongnu.org List-Id: kvm.vger.kernel.org On Fri, Jan 25, 2013 at 04:55:29PM +0100, Andreas F=C3=A4rber wrote: > Since commit 20d695a9254c1b086a456d3b79a3c311236643ba (kvm: Pass > CPUState to kvm_arch_*) CPUArchState is no longer needed. >=20 > Allows to change qemu_kvm_eat_signals() argument as well. >=20 > Signed-off-by: Andreas F=C3=A4rber Reviewed-by: Gleb Natapov > --- > Extracted from my qom-cpu-8 queue. >=20 > cpus.c | 8 ++++---- > include/sysemu/kvm.h | 2 +- > kvm-all.c | 3 +-- > kvm-stub.c | 2 +- > 4 Dateien ge=C3=A4ndert, 7 Zeilen hinzugef=C3=BCgt(+), 8 Zeilen entfernt= (-) >=20 > diff --git a/cpus.c b/cpus.c > index a4390c3..41779eb 100644 > --- a/cpus.c > +++ b/cpus.c > @@ -517,7 +517,7 @@ static void qemu_init_sigbus(void) > prctl(PR_MCE_KILL, PR_MCE_KILL_SET, PR_MCE_KILL_EARLY, 0, 0); > } > =20 > -static void qemu_kvm_eat_signals(CPUArchState *env) > +static void qemu_kvm_eat_signals(CPUState *cpu) > { > struct timespec ts =3D { 0, 0 }; > siginfo_t siginfo; > @@ -538,7 +538,7 @@ static void qemu_kvm_eat_signals(CPUArchState *env) > =20 > switch (r) { > case SIGBUS: > - if (kvm_on_sigbus_vcpu(env, siginfo.si_code, siginfo.si_addr= )) { > + if (kvm_on_sigbus_vcpu(cpu, siginfo.si_code, siginfo.si_addr= )) { > sigbus_reraise(); > } > break; > @@ -560,7 +560,7 @@ static void qemu_init_sigbus(void) > { > } > =20 > -static void qemu_kvm_eat_signals(CPUArchState *env) > +static void qemu_kvm_eat_signals(CPUState *cpu) > { > } > #endif /* !CONFIG_LINUX */ > @@ -727,7 +727,7 @@ static void qemu_kvm_wait_io_event(CPUArchState *env) > qemu_cond_wait(cpu->halt_cond, &qemu_global_mutex); > } > =20 > - qemu_kvm_eat_signals(env); > + qemu_kvm_eat_signals(cpu); > qemu_wait_io_event_common(cpu); > } > =20 > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index 384ee66..6e6dfb3 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -159,7 +159,7 @@ int kvm_update_guest_debug(CPUArchState *env, unsigne= d long reinject_trap); > int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset); > #endif > =20 > -int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr); > +int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); > int kvm_on_sigbus(int code, void *addr); > =20 > /* internal API */ > diff --git a/kvm-all.c b/kvm-all.c > index 363a358..04ec2d5 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -2026,9 +2026,8 @@ int kvm_set_ioeventfd_pio_word(int fd, uint16_t add= r, uint16_t val, bool assign) > return 0; > } > =20 > -int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr) > +int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) > { > - CPUState *cpu =3D ENV_GET_CPU(env); > return kvm_arch_on_sigbus_vcpu(cpu, code, addr); > } > =20 > diff --git a/kvm-stub.c b/kvm-stub.c > index 47f8dca..760aadc 100644 > --- a/kvm-stub.c > +++ b/kvm-stub.c > @@ -112,7 +112,7 @@ int kvm_set_ioeventfd_mmio(int fd, uint32_t adr, uint= 32_t val, bool assign, uint > return -ENOSYS; > } > =20 > -int kvm_on_sigbus_vcpu(CPUArchState *env, int code, void *addr) > +int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr) > { > return 1; > } > --=20 > 1.7.10.4 -- Gleb.