| Message ID | 1379156917-17497-3-git-send-email-anup.patel@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Sat, Sep 14, 2013 at 04:38:35PM +0530, Anup Patel wrote: > This patch implements kvm_vcpu_preferred_target() function for > KVM ARM64 which will help us implement KVM_ARM_PREFERRED_TARGET > ioctl for user space. > > Signed-off-by: Anup Patel <anup.patel@linaro.org> > Signed-off-by: Pranavkumar Sawargaonkar <pranavkumar@linaro.org> > --- > arch/arm/include/asm/kvm_host.h | 1 + > arch/arm64/kvm/guest.c | 20 ++++++++++++++++++++ > 2 files changed, 21 insertions(+) > > diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h > index 7d22517..76f3c19 100644 > --- a/arch/arm/include/asm/kvm_host.h > +++ b/arch/arm/include/asm/kvm_host.h > @@ -154,6 +154,7 @@ struct kvm_vcpu_stat { > struct kvm_vcpu_init; > int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, > const struct kvm_vcpu_init *init); > +int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init); > unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); > int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices); > struct kvm_one_reg; > diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c > index d7bf7d6..f8eb062 100644 > --- a/arch/arm64/kvm/guest.c > +++ b/arch/arm64/kvm/guest.c > @@ -254,6 +254,26 @@ int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, > return kvm_reset_vcpu(vcpu); > } > > +int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init) > +{ > + int target = kvm_target_cpu(); > + > + if (target < 0) > + return target; > + > + memset(init, 0, sizeof(*init)); > + > + /* For now, we return all optional features are available > + * for preferred target. In future, we might have features > + * available based on underlying host. > + */ same here, with comment formatting > + init->target = (__u32)target; > + init->features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); > + init->features[0] |= (1 << KVM_ARM_VCPU_EL1_32BIT); > + > + return 0; > +} > + > int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) > { > return -EINVAL; > -- > 1.7.9.5 >
diff --git a/arch/arm/include/asm/kvm_host.h b/arch/arm/include/asm/kvm_host.h index 7d22517..76f3c19 100644 --- a/arch/arm/include/asm/kvm_host.h +++ b/arch/arm/include/asm/kvm_host.h @@ -154,6 +154,7 @@ struct kvm_vcpu_stat { struct kvm_vcpu_init; int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, const struct kvm_vcpu_init *init); +int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init); unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu); int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices); struct kvm_one_reg; diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index d7bf7d6..f8eb062 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -254,6 +254,26 @@ int kvm_vcpu_set_target(struct kvm_vcpu *vcpu, return kvm_reset_vcpu(vcpu); } +int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init) +{ + int target = kvm_target_cpu(); + + if (target < 0) + return target; + + memset(init, 0, sizeof(*init)); + + /* For now, we return all optional features are available + * for preferred target. In future, we might have features + * available based on underlying host. + */ + init->target = (__u32)target; + init->features[0] |= (1 << KVM_ARM_VCPU_POWER_OFF); + init->features[0] |= (1 << KVM_ARM_VCPU_EL1_32BIT); + + return 0; +} + int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) { return -EINVAL;