From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2zNn-0003dA-Ha for qemu-devel@nongnu.org; Wed, 18 May 2016 07:11:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b2zNm-0004ye-7D for qemu-devel@nongnu.org; Wed, 18 May 2016 07:11:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39508) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b2zNm-0004yP-0j for qemu-devel@nongnu.org; Wed, 18 May 2016 07:11:18 -0400 References: <1463412982-6681-1-git-send-email-pbonzini@redhat.com> <20160518102147.30c63802.cornelia.huck@de.ibm.com> <20160518105952.3cd61418.cornelia.huck@de.ibm.com> From: Paolo Bonzini Message-ID: <6c4b2f9a-ef49-2a56-817f-9b62f4b2b6ed@redhat.com> Date: Wed, 18 May 2016 13:11:08 +0200 MIME-Version: 1.0 In-Reply-To: <20160518105952.3cd61418.cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH CFT v3 00/50] NEED_CPU_H / cpu.h / hw/hw.h cleanups List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: qemu-devel@nongnu.org, Thomas Huth On 18/05/2016 10:59, Cornelia Huck wrote: >> That's on one of my s390x systems; on another one (where I don't test), >> it builds. But something's wrong :) > > Ah, that's because the functioning one used --disable-kvm. > > Should the call to kvm_check_extension() be moved to target-s390x/kvm.c? It can also be moved to machine.c too... Since I don't know exactly which patch causes it, I can put this at the beginning: >>From 2f86d8c15e0b0514116d36727ecaf3f479f2af33 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 18 May 2016 13:08:02 +0200 Subject: [PATCH] s390x: move vregs_needed to machine.c It is only needed in one file, move it there. Signed-off-by: Paolo Bonzini --- target-s390x/cpu.h | 15 --------------- target-s390x/machine.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 07f76ad..0a0d0fa 100644 --- a/target-s390x/cpu.h +++ b/target-s390x/cpu.h @@ -1264,21 +1264,6 @@ static inline void s390_crypto_reset(void) } } -#ifdef CONFIG_KVM -static inline bool vregs_needed(void *opaque) -{ - if (kvm_enabled()) { - return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS); - } - return 0; -} -#else -static inline bool vregs_needed(void *opaque) -{ - return 0; -} -#endif - /* machine check interruption code */ /* subclasses */ diff --git a/target-s390x/machine.c b/target-s390x/machine.c index 6b26090..d2b52b2 100644 --- a/target-s390x/machine.c +++ b/target-s390x/machine.c @@ -76,6 +76,16 @@ static const VMStateDescription vmstate_fpu = { } }; +static bool vregs_needed(void *opaque) +{ +#ifdef CONFIG_KVM + if (kvm_enabled()) { + return kvm_check_extension(kvm_state, KVM_CAP_S390_VECTOR_REGISTERS); + } +#endif + return 0; +} + static const VMStateDescription vmstate_vregs = { .name = "cpu/vregs", .version_id = 1, -- 2.5.5 Thanks, Paolo