From: Avi Kivity <avi@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: kvm@vger.kernel.org, Xiantao Zhang <xiantao.zhang@intel.com>
Subject: [PATCH 02/25] KVM: ia64: Implement kvm_arch_vcpu_ioctl_{set,get}_mpstate
Date: Sun, 28 Sep 2008 18:44:38 +0300 [thread overview]
Message-ID: <1222616701-1206-3-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1222616701-1206-1-git-send-email-avi@redhat.com>
From: Xiantao Zhang <xiantao.zhang@intel.com>
Two ioctl arch functions are added to set vcpu's smp state.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
---
arch/ia64/kvm/kvm-ia64.c | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index cd0d1a7..7ad759e 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -179,6 +179,7 @@ int kvm_dev_ioctl_check_extension(long ext)
switch (ext) {
case KVM_CAP_IRQCHIP:
case KVM_CAP_USER_MEMORY:
+ case KVM_CAP_MP_STATE:
r = 1;
break;
@@ -1789,11 +1790,43 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
- return -EINVAL;
+ vcpu_load(vcpu);
+ mp_state->mp_state = vcpu->arch.mp_state;
+ vcpu_put(vcpu);
+ return 0;
+}
+
+static int vcpu_reset(struct kvm_vcpu *vcpu)
+{
+ int r;
+ long psr;
+ local_irq_save(psr);
+ r = kvm_insert_vmm_mapping(vcpu);
+ if (r)
+ goto fail;
+
+ vcpu->arch.launched = 0;
+ kvm_arch_vcpu_uninit(vcpu);
+ r = kvm_arch_vcpu_init(vcpu);
+ if (r)
+ goto fail;
+
+ kvm_purge_vmm_mapping(vcpu);
+ r = 0;
+fail:
+ local_irq_restore(psr);
+ return r;
}
int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
struct kvm_mp_state *mp_state)
{
- return -EINVAL;
+ int r = 0;
+
+ vcpu_load(vcpu);
+ vcpu->arch.mp_state = mp_state->mp_state;
+ if (vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)
+ r = vcpu_reset(vcpu);
+ vcpu_put(vcpu);
+ return r;
}
--
1.6.0.1
next prev parent reply other threads:[~2008-09-28 15:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-28 15:44 [PATCH 00/25] KVM Updates for 2.6.28 merge window (part 3 of 3) Avi Kivity
2008-09-28 15:44 ` [PATCH 01/25] KVM: x86 emulator: Add std and cld instructions (opcodes 0xfc-0xfd) Avi Kivity
2008-09-28 15:44 ` Avi Kivity [this message]
2008-09-28 15:44 ` [PATCH 03/25] KVM: MMU: Modify kvm_shadow_walk.entry to accept u64 addr Avi Kivity
2008-09-28 15:44 ` [PATCH 04/25] KVM: Add statistics for guest irq injections Avi Kivity
2008-09-28 15:44 ` [PATCH 05/25] KVM: x86 emulator: Add in/out instructions (opcodes 0xe4-0xe7, 0xec-0xef) Avi Kivity
2008-09-28 15:44 ` [PATCH 06/25] KVM: x86: do not execute halted vcpus Avi Kivity
2008-09-28 15:44 ` [PATCH 07/25] KVM: x86 emulator: Add call near absolute instruction (opcode 0xff/2) Avi Kivity
2008-09-28 15:44 ` [PATCH 08/25] KVM: x86: unhalt vcpu0 on reset Avi Kivity
2008-09-28 15:44 ` [PATCH 09/25] KVM: ppc: kvmppc_44x_shadow_release() does not require mmap_sem to be locked Avi Kivity
2008-09-28 15:44 ` [PATCH 10/25] KVM: VMX: Cleanup stalled INTR_INFO read Avi Kivity
2008-09-28 15:44 ` [PATCH 11/25] KVM: x86 emulator: fix jmp r/m64 instruction Avi Kivity
2008-09-28 15:44 ` [PATCH 12/25] add MAINTAINERS entry for the KVM AMD module Avi Kivity
2008-09-28 15:44 ` [PATCH 13/25] x86: Move VMX MSRs to msr-index.h Avi Kivity
2008-09-28 15:44 ` [PATCH 14/25] KVM: VMX: Rename IA32_FEATURE_CONTROL bits Avi Kivity
2008-09-28 15:44 ` [PATCH 15/25] x86: Move FEATURE_CONTROL bits to msr-index.h Avi Kivity
2008-09-28 15:44 ` [PATCH 16/25] KVM: x86 emulator: Add DstAcc operand type Avi Kivity
2008-09-28 15:44 ` [PATCH 17/25] KVM: x86 emulator: Add cmp al, imm and cmp ax, imm instructions (ocodes 3c, 3d) Avi Kivity
2008-09-28 15:44 ` [PATCH 18/25] KVM: x86 emulator: Use DstAcc for 'and' Avi Kivity
2008-09-28 15:44 ` [PATCH 19/25] VT-d: Changes to support KVM Avi Kivity
2008-09-28 15:44 ` [PATCH 20/25] KVM: Device Assignment with VT-d Avi Kivity
2008-09-28 15:44 ` [PATCH 21/25] KVM: Device Assignment: Free device structures if IRQ allocation fails Avi Kivity
2008-09-28 15:44 ` [PATCH 22/25] KVM: opencode gfn_to_page in kvm_vm_fault Avi Kivity
2008-09-28 15:44 ` [PATCH 23/25] KVM: switch to get_user_pages_fast Avi Kivity
2008-09-28 15:45 ` [PATCH 24/25] KVM: x86.c make kvm_load_realmode_segment static Avi Kivity
2008-09-28 15:45 ` [PATCH 25/25] MAINTAINERS: Update Avi Kivity's email address Avi Kivity
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=1222616701-1206-3-git-send-email-avi@redhat.com \
--to=avi@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=xiantao.zhang@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome