[PATCH 15/15] KVM: Future-proof argument-less ioctls

2007-03-11 Thread Avi Kivity 
Some ioctls ignore their arguments.  By requiring them to be zero now,
we allow a nonzero value to have some special meaning in the future.

Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
---
 drivers/kvm/kvm_main.c |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index b81f007..bf8403e 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2169,6 +2169,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
 
switch (ioctl) {
case KVM_RUN:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = kvm_vcpu_ioctl_run(vcpu, vcpu->run);
break;
case KVM_GET_REGS: {
@@ -2440,9 +2443,15 @@ static long kvm_dev_ioctl(struct file *filp,
 
switch (ioctl) {
case KVM_GET_API_VERSION:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = KVM_API_VERSION;
break;
case KVM_CREATE_VM:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = kvm_dev_ioctl_create_vm();
break;
case KVM_GET_MSR_INDEX_LIST: {
-- 
1.5.0.2

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 15/15] KVM: Future-proof argument-less ioctls

2007-03-11 Thread Avi Kivity 
Some ioctls ignore their arguments.  By requiring them to be zero now,
we allow a nonzero value to have some special meaning in the future.

Signed-off-by: Avi Kivity [EMAIL PROTECTED]
---
 drivers/kvm/kvm_main.c |9 +
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index b81f007..bf8403e 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2169,6 +2169,9 @@ static long kvm_vcpu_ioctl(struct file *filp,
 
switch (ioctl) {
case KVM_RUN:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = kvm_vcpu_ioctl_run(vcpu, vcpu-run);
break;
case KVM_GET_REGS: {
@@ -2440,9 +2443,15 @@ static long kvm_dev_ioctl(struct file *filp,
 
switch (ioctl) {
case KVM_GET_API_VERSION:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = KVM_API_VERSION;
break;
case KVM_CREATE_VM:
+   r = -EINVAL;
+   if (arg)
+   goto out;
r = kvm_dev_ioctl_create_vm();
break;
case KVM_GET_MSR_INDEX_LIST: {
-- 
1.5.0.2

-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/