From a031d8207cbc238a11e619627b8aadb01d59ba85 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Mon, 10 Dec 2012 10:33:38 -0700 Subject: [PATCH] --- yaml --- r: 356793 b: refs/heads/master c: 0f888f5acd0cd806d4fd9f4067276b3855a13309 h: refs/heads/master i: 356791: 0222c38880d5cb4d8bb5342081a17420626ad098 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/kvm_host.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2a8eff12ea02..1d352f8c8658 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e702d9af5d633cf0eca76f6340b3c50fbb5a4e5 +refs/heads/master: 0f888f5acd0cd806d4fd9f4067276b3855a13309 diff --git a/trunk/arch/x86/include/asm/kvm_host.h b/trunk/arch/x86/include/asm/kvm_host.h index 51d52108f109..c431b33271f3 100644 --- a/trunk/arch/x86/include/asm/kvm_host.h +++ b/trunk/arch/x86/include/asm/kvm_host.h @@ -33,7 +33,7 @@ #define KVM_MAX_VCPUS 254 #define KVM_SOFT_MAX_VCPUS 160 -#define KVM_USER_MEM_SLOTS 32 +#define KVM_USER_MEM_SLOTS 125 /* memory slots that are not exposed to userspace */ #define KVM_PRIVATE_MEM_SLOTS 3 #define KVM_MEM_SLOTS_NUM (KVM_USER_MEM_SLOTS + KVM_PRIVATE_MEM_SLOTS)