From 9486594bae7a4725c66e636a7f5def560baaf623 Mon Sep 17 00:00:00 2001
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Wed, 2 May 2012 10:50:38 +0200
Subject: [PATCH] --- yaml --- r: 307881 b: refs/heads/master c:
 e726b1bd64b0b8945c171d2d4bf749fba9fc0800 h: refs/heads/master i:   307879:
 68e0847b3c4984cc6a647cc7d8ccdcf97d85a9ea v: v3

---
 [refs]                         | 2 +-
 trunk/arch/s390/kvm/kvm-s390.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0401cb7f6815..878bdd3e5768 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c3f61e2ddb6c1845704fd8ef1b999ecd2e4725c
+refs/heads/master: e726b1bd64b0b8945c171d2d4bf749fba9fc0800
diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c
index fd98914a36f1..e5e3800b0125 100644
--- a/trunk/arch/s390/kvm/kvm-s390.c
+++ b/trunk/arch/s390/kvm/kvm-s390.c
@@ -136,6 +136,10 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_SYNC_REGS:
 		r = 1;
 		break;
+	case KVM_CAP_NR_VCPUS:
+	case KVM_CAP_MAX_VCPUS:
+		r = KVM_MAX_VCPUS;
+		break;
 	default:
 		r = 0;
 	}