From patchwork Mon Sep 21 08:45:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 49004 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8L8jP3J026868 for ; Mon, 21 Sep 2009 08:45:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755122AbZIUIpS (ORCPT ); Mon, 21 Sep 2009 04:45:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755137AbZIUIpS (ORCPT ); Mon, 21 Sep 2009 04:45:18 -0400 Received: from mtagate8-bp.emea.ibm.com ([195.212.17.168]:45538 "EHLO mtagate8.de.ibm.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755018AbZIUIpR (ORCPT ); Mon, 21 Sep 2009 04:45:17 -0400 Received: from d12nrmr1607.megacenter.de.ibm.com (d12nrmr1607.megacenter.de.ibm.com [9.149.167.49]) by mtagate8.de.ibm.com (8.13.1/8.13.1) with ESMTP id n8L8jKpS013409 for ; Mon, 21 Sep 2009 08:45:20 GMT Received: from d12av04.megacenter.de.ibm.com (d12av04.megacenter.de.ibm.com [9.149.165.229]) by d12nrmr1607.megacenter.de.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id n8L8jKTs3174426 for ; Mon, 21 Sep 2009 10:45:20 +0200 Received: from d12av04.megacenter.de.ibm.com (loopback [127.0.0.1]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id n8L8jJWV029074 for ; Mon, 21 Sep 2009 10:45:19 +0200 Received: from cborntra.localnet (dyn-9-152-224-56.boeblingen.de.ibm.com [9.152.224.56]) by d12av04.megacenter.de.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id n8L8jISP029068 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Sep 2009 10:45:19 +0200 From: Christian Borntraeger Organization: IBM To: Avi Kivity , Marcelo Tosatti Subject: [PATCH] kvm-s390: fix memsize >=4G on linus git head Date: Mon, 21 Sep 2009 10:45:18 +0200 User-Agent: KMail/1.12.1 (Linux/2.6.31-release; KDE/4.3.1; i686; ; ) Cc: kvm@vger.kernel.org, Heiko Carstens , Martin Schwidefsky , Carsten Otte , Christian Ehrhardt MIME-Version: 1.0 Message-Id: <200909211045.18487.borntraeger@de.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Avi, Marcelo, commit 628eb9b8a8f3ef31d8316112a4596b1a21b38159 KVM: s390: streamline memslot handling introduced kvm_s390_vcpu_get_memsize. This broke guests >=4G, since this function returned an int. This patch changes the return value to a long. Signed-off-by: Christian Borntraeger --- arch/s390/kvm/kvm-s390.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 Index: linux-2.6/arch/s390/kvm/kvm-s390.h =================================================================== --- linux-2.6.orig/arch/s390/kvm/kvm-s390.h +++ linux-2.6/arch/s390/kvm/kvm-s390.h @@ -58,7 +58,7 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu int kvm_s390_inject_program_int(struct kvm_vcpu *vcpu, u16 code); int kvm_s390_inject_sigp_stop(struct kvm_vcpu *vcpu, int action); -static inline int kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu) +static inline long kvm_s390_vcpu_get_memsize(struct kvm_vcpu *vcpu) { return vcpu->arch.sie_block->gmslm - vcpu->arch.sie_block->gmsor