diff mbox

[4/5] KVM: s390: Base infrastructure for enabling capabilities.

Message ID 1354883425-38531-5-git-send-email-cornelia.huck@de.ibm.com (mailing list archive)
State New, archived
Headers show

Commit Message

Cornelia Huck Dec. 7, 2012, 12:30 p.m. UTC 
Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 Documentation/virtual/kvm/api.txt |  2 +-
 arch/s390/kvm/kvm-s390.c          | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

Comments

Alexander Graf Dec. 10, 2012, 7:54 a.m. UTC | #1 
Missing patch description. Otherwise:

Acked-by: Alexander Graf <agraf@suse.de>


Alex

On 07.12.2012, at 13:30, Cornelia Huck wrote:

> Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> ---
> Documentation/virtual/kvm/api.txt |  2 +-
> arch/s390/kvm/kvm-s390.c          | 26 ++++++++++++++++++++++++++
> 2 files changed, 27 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
> index 8617339..bba630b 100644
> --- a/Documentation/virtual/kvm/api.txt
> +++ b/Documentation/virtual/kvm/api.txt
> @@ -913,7 +913,7 @@ documentation when it pops into existence).
> 4.37 KVM_ENABLE_CAP
> 
> Capability: KVM_CAP_ENABLE_CAP
> -Architectures: ppc
> +Architectures: ppc, s390
> Type: vcpu ioctl
> Parameters: struct kvm_enable_cap (in)
> Returns: 0 on success; -1 on error
> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> index 731ddee..c015f6f 100644
> --- a/arch/s390/kvm/kvm-s390.c
> +++ b/arch/s390/kvm/kvm-s390.c
> @@ -140,6 +140,7 @@ int kvm_dev_ioctl_check_extension(long ext)
> #endif
> 	case KVM_CAP_SYNC_REGS:
> 	case KVM_CAP_ONE_REG:
> +	case KVM_CAP_ENABLE_CAP:
> 		r = 1;
> 		break;
> 	case KVM_CAP_NR_VCPUS:
> @@ -812,6 +813,22 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
> 	return 0;
> }
> 
> +static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
> +				     struct kvm_enable_cap *cap)
> +{
> +	int r;
> +
> +	if (cap->flags)
> +		return -EINVAL;
> +
> +	switch (cap->cap) {
> +	default:
> +		r = -EINVAL;
> +		break;
> +	}
> +	return r;
> +}
> +
> long kvm_arch_vcpu_ioctl(struct file *filp,
> 			 unsigned int ioctl, unsigned long arg)
> {
> @@ -898,6 +915,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
> 			r = 0;
> 		break;
> 	}
> +	case KVM_ENABLE_CAP:
> +	{
> +		struct kvm_enable_cap cap;
> +		r = -EFAULT;
> +		if (copy_from_user(&cap, argp, sizeof(cap)))
> +			break;
> +		r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
> +		break;
> +	}
> 	default:
> 		r = -ENOTTY;
> 	}
> -- 
> 1.7.12.4
> 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Cornelia Huck Dec. 10, 2012, 10:16 a.m. UTC | #2 
On Mon, 10 Dec 2012 08:54:45 +0100
Alexander Graf <agraf@suse.de> wrote:

> Missing patch description. Otherwise:

"Add base infrastructure for enabling capabilities" would be redundant,
no?

> 
> Acked-by: Alexander Graf <agraf@suse.de>
> 
> 
> Alex
> 
> On 07.12.2012, at 13:30, Cornelia Huck wrote:
> 
> > Reviewed-by: Marcelo Tosatti <mtosatti@redhat.com>
> > Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
> > ---
> > Documentation/virtual/kvm/api.txt |  2 +-
> > arch/s390/kvm/kvm-s390.c          | 26 ++++++++++++++++++++++++++
> > 2 files changed, 27 insertions(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
> > index 8617339..bba630b 100644
> > --- a/Documentation/virtual/kvm/api.txt
> > +++ b/Documentation/virtual/kvm/api.txt
> > @@ -913,7 +913,7 @@ documentation when it pops into existence).
> > 4.37 KVM_ENABLE_CAP
> > 
> > Capability: KVM_CAP_ENABLE_CAP
> > -Architectures: ppc
> > +Architectures: ppc, s390
> > Type: vcpu ioctl
> > Parameters: struct kvm_enable_cap (in)
> > Returns: 0 on success; -1 on error
> > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> > index 731ddee..c015f6f 100644
> > --- a/arch/s390/kvm/kvm-s390.c
> > +++ b/arch/s390/kvm/kvm-s390.c
> > @@ -140,6 +140,7 @@ int kvm_dev_ioctl_check_extension(long ext)
> > #endif
> > 	case KVM_CAP_SYNC_REGS:
> > 	case KVM_CAP_ONE_REG:
> > +	case KVM_CAP_ENABLE_CAP:
> > 		r = 1;
> > 		break;
> > 	case KVM_CAP_NR_VCPUS:
> > @@ -812,6 +813,22 @@ int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
> > 	return 0;
> > }
> > 
> > +static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
> > +				     struct kvm_enable_cap *cap)
> > +{
> > +	int r;
> > +
> > +	if (cap->flags)
> > +		return -EINVAL;
> > +
> > +	switch (cap->cap) {
> > +	default:
> > +		r = -EINVAL;
> > +		break;
> > +	}
> > +	return r;
> > +}
> > +
> > long kvm_arch_vcpu_ioctl(struct file *filp,
> > 			 unsigned int ioctl, unsigned long arg)
> > {
> > @@ -898,6 +915,15 @@ long kvm_arch_vcpu_ioctl(struct file *filp,
> > 			r = 0;
> > 		break;
> > 	}
> > +	case KVM_ENABLE_CAP:
> > +	{
> > +		struct kvm_enable_cap cap;
> > +		r = -EFAULT;
> > +		if (copy_from_user(&cap, argp, sizeof(cap)))
> > +			break;
> > +		r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
> > +		break;
> > +	}
> > 	default:
> > 		r = -ENOTTY;
> > 	}
> > -- 
> > 1.7.12.4
> > 
> 

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Alexander Graf Dec. 11, 2012, 10:24 a.m. UTC | #3 
On 10.12.2012, at 11:16, Cornelia Huck wrote:

> On Mon, 10 Dec 2012 08:54:45 +0100
> Alexander Graf <agraf@suse.de> wrote:
> 
>> Missing patch description. Otherwise:
> 
> "Add base infrastructure for enabling capabilities" would be redundant,
> no?

Well, whoever pulls this gets to say what style he likes. I simply heads-on reject every patch that doesn't contain a patch description, but only a subject line :). Others are a lot more relaxed about this.

And yes, it'd be redundant, but easier readable imho.


Alex

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/Documentation/virtual/kvm/api.txt b/Documentation/virtual/kvm/api.txt
index 8617339..bba630b 100644
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
@@ -913,7 +913,7 @@  documentation when it pops into existence).
 4.37 KVM_ENABLE_CAP
 
 Capability: KVM_CAP_ENABLE_CAP
-Architectures: ppc
+Architectures: ppc, s390
 Type: vcpu ioctl
 Parameters: struct kvm_enable_cap (in)
 Returns: 0 on success; -1 on error
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 731ddee..c015f6f 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -140,6 +140,7 @@  int kvm_dev_ioctl_check_extension(long ext)
 #endif
 	case KVM_CAP_SYNC_REGS:
 	case KVM_CAP_ONE_REG:
+	case KVM_CAP_ENABLE_CAP:
 		r = 1;
 		break;
 	case KVM_CAP_NR_VCPUS:
@@ -812,6 +813,22 @@  int kvm_s390_vcpu_store_status(struct kvm_vcpu *vcpu, unsigned long addr)
 	return 0;
 }
 
+static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
+				     struct kvm_enable_cap *cap)
+{
+	int r;
+
+	if (cap->flags)
+		return -EINVAL;
+
+	switch (cap->cap) {
+	default:
+		r = -EINVAL;
+		break;
+	}
+	return r;
+}
+
 long kvm_arch_vcpu_ioctl(struct file *filp,
 			 unsigned int ioctl, unsigned long arg)
 {
@@ -898,6 +915,15 @@  long kvm_arch_vcpu_ioctl(struct file *filp,
 			r = 0;
 		break;
 	}
+	case KVM_ENABLE_CAP:
+	{
+		struct kvm_enable_cap cap;
+		r = -EFAULT;
+		if (copy_from_user(&cap, argp, sizeof(cap)))
+			break;
+		r = kvm_vcpu_ioctl_enable_cap(vcpu, &cap);
+		break;
+	}
 	default:
 		r = -ENOTTY;
 	}