From 43bb52c5bd1030e01c2ad6b66e976dfefa11fc99 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Fri, 12 Mar 2010 12:59:06 +0800
Subject: [PATCH] --- yaml --- r: 197663 b: refs/heads/master c:
 a87fa35514bcf17aeca97245574e3f735cec9074 h: refs/heads/master i:   197661:
 54d36560e6de84980ffe5bfe213d87b508688f02   197659:
 31b60125101da847570c06c8c21df2304ab3f203   197655:
 2ffeb681c19dbaef2c2b0a551ef2ce27f24f54c9   197647:
 a1079cd1c6756a6803d0a6187e368cfb367182d1   197631:
 25ce0b3385453dfd886b175dd38f1829ad7835f2 v: v3

---
 [refs]                          | 2 +-
 trunk/virt/kvm/coalesced_mmio.c | 4 ++--
 trunk/virt/kvm/kvm_main.c       | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d0f43af556f0..a94ecba5258d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 600f1ec3761671307935a583c46f17fff0fa9b72
+refs/heads/master: a87fa35514bcf17aeca97245574e3f735cec9074
diff --git a/trunk/virt/kvm/coalesced_mmio.c b/trunk/virt/kvm/coalesced_mmio.c
index 36e258029649..b66001f8754c 100644
--- a/trunk/virt/kvm/coalesced_mmio.c
+++ b/trunk/virt/kvm/coalesced_mmio.c
@@ -139,7 +139,7 @@ int kvm_vm_ioctl_register_coalesced_mmio(struct kvm *kvm,
 	struct kvm_coalesced_mmio_dev *dev = kvm->coalesced_mmio_dev;
 
 	if (dev == NULL)
-		return -EINVAL;
+		return -ENXIO;
 
 	mutex_lock(&kvm->slots_lock);
 	if (dev->nb_zones >= KVM_COALESCED_MMIO_ZONE_MAX) {
@@ -162,7 +162,7 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm,
 	struct kvm_coalesced_mmio_zone *z;
 
 	if (dev == NULL)
-		return -EINVAL;
+		return -ENXIO;
 
 	mutex_lock(&kvm->slots_lock);
 
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index b152b23cd095..0db6dfcc8420 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -1609,7 +1609,6 @@ static long kvm_vm_ioctl(struct file *filp,
 		r = -EFAULT;
 		if (copy_from_user(&zone, argp, sizeof zone))
 			goto out;
-		r = -ENXIO;
 		r = kvm_vm_ioctl_register_coalesced_mmio(kvm, &zone);
 		if (r)
 			goto out;
@@ -1621,7 +1620,6 @@ static long kvm_vm_ioctl(struct file *filp,
 		r = -EFAULT;
 		if (copy_from_user(&zone, argp, sizeof zone))
 			goto out;
-		r = -ENXIO;
 		r = kvm_vm_ioctl_unregister_coalesced_mmio(kvm, &zone);
 		if (r)
 			goto out;