From: Jan Kiszka <jan.kiszka@siemens.com> To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com> Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org, Huang Ying <ying.huang@intel.com>, Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>, Jin Dongming <jin.dongming@np.css.fujitsu.com> Subject: [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce Date: Tue, 15 Feb 2011 09:23:34 +0100 [thread overview] Message-ID: <139bcf9a4a0ed788fa7807e3de7c4ead97b42f14.1297758211.git.jan.kiszka@siemens.com> (raw) In-Reply-To: <cover.1297758211.git.jan.kiszka@siemens.com> In-Reply-To: <cover.1297758211.git.jan.kiszka@siemens.com> There is nothing to abstract here. Fold kvm_setup_mce into its caller and fix up the error reporting (return code of kvm_vcpu_ioctl holds the error value). Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Huang Ying <ying.huang@intel.com> CC: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> CC: Jin Dongming <jin.dongming@np.css.fujitsu.com> --- target-i386/kvm.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8be093b..7cdff65 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -187,11 +187,6 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, return -ENOSYS; } -static int kvm_setup_mce(CPUState *env, uint64_t *mcg_cap) -{ - return kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, mcg_cap); -} - static void kvm_mce_inject(CPUState *env, target_phys_addr_t paddr, int code) { uint64_t status = MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN | @@ -446,6 +441,7 @@ int kvm_arch_init_vcpu(CPUState *env) && kvm_check_extension(env->kvm_state, KVM_CAP_MCE) > 0) { uint64_t mcg_cap; int banks; + int ret; if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) { perror("kvm_get_mce_cap_supported FAILED"); @@ -454,8 +450,9 @@ int kvm_arch_init_vcpu(CPUState *env) banks = MCE_BANKS_DEF; mcg_cap &= MCE_CAP_DEF; mcg_cap |= banks; - if (kvm_setup_mce(env, &mcg_cap)) { - perror("kvm_setup_mce FAILED"); + ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap); + if (ret < 0) { + fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret)); } else { env->mcg_cap = mcg_cap; } -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: Jan Kiszka <jan.kiszka@siemens.com> To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com> Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>, Jin Dongming <jin.dongming@np.css.fujitsu.com>, qemu-devel@nongnu.org, kvm@vger.kernel.org, Huang Ying <ying.huang@intel.com> Subject: [Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce Date: Tue, 15 Feb 2011 09:23:34 +0100 [thread overview] Message-ID: <139bcf9a4a0ed788fa7807e3de7c4ead97b42f14.1297758211.git.jan.kiszka@siemens.com> (raw) In-Reply-To: <cover.1297758211.git.jan.kiszka@siemens.com> In-Reply-To: <cover.1297758211.git.jan.kiszka@siemens.com> There is nothing to abstract here. Fold kvm_setup_mce into its caller and fix up the error reporting (return code of kvm_vcpu_ioctl holds the error value). Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> CC: Huang Ying <ying.huang@intel.com> CC: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> CC: Jin Dongming <jin.dongming@np.css.fujitsu.com> --- target-i386/kvm.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 8be093b..7cdff65 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -187,11 +187,6 @@ static int kvm_get_mce_cap_supported(KVMState *s, uint64_t *mce_cap, return -ENOSYS; } -static int kvm_setup_mce(CPUState *env, uint64_t *mcg_cap) -{ - return kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, mcg_cap); -} - static void kvm_mce_inject(CPUState *env, target_phys_addr_t paddr, int code) { uint64_t status = MCI_STATUS_VAL | MCI_STATUS_UC | MCI_STATUS_EN | @@ -446,6 +441,7 @@ int kvm_arch_init_vcpu(CPUState *env) && kvm_check_extension(env->kvm_state, KVM_CAP_MCE) > 0) { uint64_t mcg_cap; int banks; + int ret; if (kvm_get_mce_cap_supported(env->kvm_state, &mcg_cap, &banks)) { perror("kvm_get_mce_cap_supported FAILED"); @@ -454,8 +450,9 @@ int kvm_arch_init_vcpu(CPUState *env) banks = MCE_BANKS_DEF; mcg_cap &= MCE_CAP_DEF; mcg_cap |= banks; - if (kvm_setup_mce(env, &mcg_cap)) { - perror("kvm_setup_mce FAILED"); + ret = kvm_vcpu_ioctl(env, KVM_X86_SETUP_MCE, &mcg_cap); + if (ret < 0) { + fprintf(stderr, "KVM_X86_SETUP_MCE: %s", strerror(-ret)); } else { env->mcg_cap = mcg_cap; } -- 1.7.1
next prev parent reply other threads:[~2011-02-15 8:23 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-02-15 8:23 [PATCH 00/13] [uq/master] Patch queue, part IV (MCE edition) Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 01/13] x86: Account for MCE in cpu_has_work Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 02/13] x86: Perform implicit mcg_status reset Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 03/13] x86: Small cleanups of MCE helpers Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 04/13] x86: Refine error reporting of MCE injection services Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 05/13] x86: Optionally avoid injecting AO MCEs while others are pending Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 06/13] Synchronize VCPU states before reset Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 07/13] kvm: x86: Move MCE functions together Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 08/13] kvm: x86: Inject pending MCE events on state writeback Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-17 16:35 ` Marcelo Tosatti 2011-02-17 16:35 ` [Qemu-devel] " Marcelo Tosatti 2011-02-17 17:06 ` Jan Kiszka 2011-02-17 17:06 ` [Qemu-devel] " Jan Kiszka 2011-02-17 17:55 ` Marcelo Tosatti 2011-02-17 17:55 ` [Qemu-devel] " Marcelo Tosatti 2011-02-17 18:04 ` Jan Kiszka 2011-02-17 18:04 ` [Qemu-devel] " Jan Kiszka 2011-02-17 18:17 ` Marcelo Tosatti 2011-02-17 18:17 ` [Qemu-devel] " Marcelo Tosatti 2011-02-15 8:23 ` [PATCH 09/13] kvm: x86: Consolidate TCG and KVM MCE injection code Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-17 18:08 ` Marcelo Tosatti 2011-02-17 18:08 ` [Qemu-devel] " Marcelo Tosatti 2011-02-17 18:17 ` Jan Kiszka 2011-02-17 18:17 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` Jan Kiszka [this message] 2011-02-15 8:23 ` [Qemu-devel] [PATCH 10/13] kvm: x86: Clean up kvm_setup_mce Jan Kiszka 2011-02-15 8:23 ` [PATCH 11/13] kvm: x86: Fail kvm_arch_init_vcpu if MCE initialization fails Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 12/13] Add qemu_ram_remap Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka 2011-02-15 8:23 ` [PATCH 13/13] KVM, MCE, unpoison memory address across reboot Jan Kiszka 2011-02-15 8:23 ` [Qemu-devel] " Jan Kiszka
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=139bcf9a4a0ed788fa7807e3de7c4ead97b42f14.1297758211.git.jan.kiszka@siemens.com \ --to=jan.kiszka@siemens.com \ --cc=avi@redhat.com \ --cc=jin.dongming@np.css.fujitsu.com \ --cc=kvm@vger.kernel.org \ --cc=mtosatti@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=seto.hidetoshi@jp.fujitsu.com \ --cc=ying.huang@intel.com \ /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.