From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45678) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b34Sa-0000Od-Dc for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b34SR-0000la-Dj for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:36 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:32855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b34SR-0000lU-6S for qemu-devel@nongnu.org; Wed, 18 May 2016 12:36:27 -0400 Received: by mail-wm0-x242.google.com with SMTP id r12so14275000wme.0 for ; Wed, 18 May 2016 09:36:27 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-252-58.clienti.tiscali.it. [78.12.252.58]) by smtp.gmail.com with ESMTPSA id j6sm9540397wjb.29.2016.05.18.09.36.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 May 2016 09:36:25 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 18 May 2016 18:36:15 +0200 Message-Id: <1463589381-66853-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1463589381-66853-1-git-send-email-pbonzini@redhat.com> References: <1463589381-66853-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 02/52] s390x: move vregs_needed to machine.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 6d97c08..62c24d1 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, -- 1.8.3.1