[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce()
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce() |
Date: |
Mon, 24 Jan 2011 07:02:12 -0200 |
From: Jin Dongming <address@hidden>
Clean up cpu_inject_x86_mce() for later patch.
Signed-off-by: Jin Dongming <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
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
- [Qemu-devel] [PATCH 00/31] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 19/31] kvm: x86: Prepare kvm_get_mp_state for in-kernel irqchip, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 22/31] kvm: x86: Refactor msr_star/hsave_pa setup and checks, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 24/31] kvm: x86: Fix !CONFIG_KVM_PARA build, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 11/31] kvm: x86: Prevent sign extension of DR7 in guest debugging mode, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 30/31] kvm: x86: Implicitly clear nmi_injected/pending on reset, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 31/31] kvm: x86: Only read/write MSR_KVM_ASYNC_PF_EN if supported, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 03/31] Clean up cpu_inject_x86_mce(),
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 15/31] kvm: Stop on all fatal exit reasons, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 17/31] x86: Optionally dump code bytes on cpu_dump_state, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 02/31] kvm: convert kvm_ioctl(KVM_CHECK_EXTENSION) to kvm_check_extension(), Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 28/31] kvm: Flush coalesced mmio buffer on IO window exits, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 05/31] Add function for checking mca broadcast of CPU, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 04/31] Add "broadcast" option for mce command, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 01/31] kvm: Enable user space NMI injection for kvm guest, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 07/31] kvm: kvm_mce_inj_* subroutines for templated error injections, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 13/31] kvm: Fix coding style violations, Marcelo Tosatti, 2011/01/24
- [Qemu-devel] [PATCH 08/31] kvm: introduce kvm_inject_x86_mce_on, Marcelo Tosatti, 2011/01/24