From: Marcelo Tosatti <mtosatti@redhat.com> To: Anthony Liguori <aliguori@us.ibm.com> Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jin Dongming <jin.dongming@np.css.fujitsu.com>, Marcelo Tosatti <mtosatti@redhat.com> Subject: [PATCH 03/31] Clean up cpu_inject_x86_mce() Date: Mon, 24 Jan 2011 07:02:12 -0200 [thread overview] Message-ID: <b3cd24e04a2aea342429c09ed93468dd3206fede.1295859760.git.mtosatti@redhat.com> (raw) In-Reply-To: <cover.1295859760.git.mtosatti@redhat.com> From: Jin Dongming <jin.dongming@np.css.fujitsu.com> Clean up cpu_inject_x86_mce() for later patch. Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> --- target-i386/helper.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 25a3e36..2c94130 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1021,21 +1021,12 @@ static void breakpoint_handler(CPUState *env) /* This should come from sysemu.h - if we could include it here... */ void qemu_system_reset_request(void); -void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, +static void qemu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, uint64_t mcg_status, uint64_t addr, uint64_t misc) { uint64_t mcg_cap = cenv->mcg_cap; - unsigned bank_num = mcg_cap & 0xff; uint64_t *banks = cenv->mce_banks; - if (bank >= bank_num || !(status & MCI_STATUS_VAL)) - return; - - if (kvm_enabled()) { - kvm_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc, 0); - return; - } - /* * if MSR_MCG_CTL is not all 1s, the uncorrected error * reporting is disabled @@ -1076,6 +1067,22 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, } else banks[1] |= MCI_STATUS_OVER; } + +void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, + uint64_t mcg_status, uint64_t addr, uint64_t misc) +{ + unsigned bank_num = cenv->mcg_cap & 0xff; + + if (bank >= bank_num || !(status & MCI_STATUS_VAL)) { + return; + } + + if (kvm_enabled()) { + kvm_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc, 0); + } else { + qemu_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc); + } +} #endif /* !CONFIG_USER_ONLY */ static void mce_init(CPUX86State *cenv) -- 1.7.2.3
WARNING: multiple messages have this Message-ID (diff)
From: Marcelo Tosatti <mtosatti@redhat.com> To: Anthony Liguori <aliguori@us.ibm.com> Cc: Marcelo Tosatti <mtosatti@redhat.com>, qemu-devel@nongnu.org, kvm@vger.kernel.org, Jin Dongming <jin.dongming@np.css.fujitsu.com> Subject: [Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce() Date: Mon, 24 Jan 2011 07:02:12 -0200 [thread overview] Message-ID: <b3cd24e04a2aea342429c09ed93468dd3206fede.1295859760.git.mtosatti@redhat.com> (raw) In-Reply-To: <cover.1295859760.git.mtosatti@redhat.com> From: Jin Dongming <jin.dongming@np.css.fujitsu.com> Clean up cpu_inject_x86_mce() for later patch. Signed-off-by: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com> --- target-i386/helper.c | 27 +++++++++++++++++---------- 1 files changed, 17 insertions(+), 10 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index 25a3e36..2c94130 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -1021,21 +1021,12 @@ static void breakpoint_handler(CPUState *env) /* This should come from sysemu.h - if we could include it here... */ void qemu_system_reset_request(void); -void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, +static void qemu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, uint64_t mcg_status, uint64_t addr, uint64_t misc) { uint64_t mcg_cap = cenv->mcg_cap; - unsigned bank_num = mcg_cap & 0xff; uint64_t *banks = cenv->mce_banks; - if (bank >= bank_num || !(status & MCI_STATUS_VAL)) - return; - - if (kvm_enabled()) { - kvm_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc, 0); - return; - } - /* * if MSR_MCG_CTL is not all 1s, the uncorrected error * reporting is disabled @@ -1076,6 +1067,22 @@ void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, } else banks[1] |= MCI_STATUS_OVER; } + +void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, + uint64_t mcg_status, uint64_t addr, uint64_t misc) +{ + unsigned bank_num = cenv->mcg_cap & 0xff; + + if (bank >= bank_num || !(status & MCI_STATUS_VAL)) { + return; + } + + if (kvm_enabled()) { + kvm_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc, 0); + } else { + qemu_inject_x86_mce(cenv, bank, status, mcg_status, addr, misc); + } +} #endif /* !CONFIG_USER_ONLY */ static void mce_init(CPUX86State *cenv) -- 1.7.2.3
next prev parent reply other threads:[~2011-01-24 9:05 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-01-24 9:02 [PATCH 00/31] [PULL] qemu-kvm.git uq/master queue Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 01/31] kvm: Enable user space NMI injection for kvm guest Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 02/31] kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension() Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` Marcelo Tosatti [this message] 2011-01-24 9:02 ` [Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce() Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 04/31] Add "broadcast" option for mce command Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 05/31] Add function for checking mca broadcast of CPU Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 06/31] kvm: introduce kvm_mce_in_progress Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 07/31] kvm: kvm_mce_inj_* subroutines for templated error injections Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 08/31] kvm: introduce kvm_inject_x86_mce_on Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 09/31] kvm: x86: Fix DPL write back of segment registers Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 10/31] kvm: x86: Remove obsolete SS.RPL/DPL aligment Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 11/31] kvm: x86: Prevent sign extension of DR7 in guest debugging mode Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 12/31] kvm: x86: Fix a few coding style violations Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 13/31] kvm: Fix " Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 14/31] kvm: x86: Swallow KVM_EXIT_SET_TPR Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 15/31] kvm: Stop on all fatal exit reasons Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 16/31] kvm: Improve reporting of fatal errors Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 17/31] x86: Optionally dump code bytes on cpu_dump_state Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 18/31] kvm: x86: Align kvm_arch_put_registers code with comment Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 19/31] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 20/31] kvm: x86: Remove redundant mp_state initialization Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 21/31] kvm: x86: Fix xcr0 reset mismerge Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 22/31] kvm: x86: Refactor msr_star/hsave_pa setup and checks Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 23/31] kvm: x86: Reset paravirtual MSRs Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 24/31] kvm: x86: Fix !CONFIG_KVM_PARA build Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 25/31] kvm: Drop smp_cpus argument from init functions Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 26/31] kvm: Consolidate must-have capability checks Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 27/31] kvm: x86: Rework identity map and TSS setup for larger BIOS sizes Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 28/31] kvm: Flush coalesced mmio buffer on IO window exits Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 29/31] kvm: Do not use qemu_fair_mutex Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 30/31] kvm: x86: Implicitly clear nmi_injected/pending on reset Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-01-24 9:02 ` [PATCH 31/31] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported Marcelo Tosatti 2011-01-24 9:02 ` [Qemu-devel] " Marcelo Tosatti 2011-02-01 21:32 ` [Qemu-devel] [PATCH 00/31] [PULL] qemu-kvm.git uq/master queue Anthony Liguori 2011-02-17 20:00 ` Anthony Liguori
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=b3cd24e04a2aea342429c09ed93468dd3206fede.1295859760.git.mtosatti@redhat.com \ --to=mtosatti@redhat.com \ --cc=aliguori@us.ibm.com \ --cc=jin.dongming@np.css.fujitsu.com \ --cc=kvm@vger.kernel.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.