From patchwork Wed Jul 6 09:46:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Auger X-Patchwork-Id: 645196 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rkwts3s04z9s2G for ; Wed, 6 Jul 2016 19:48:53 +1000 (AEST) Received: from localhost ([::1]:60593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKjRr-0003oI-E6 for incoming@patchwork.ozlabs.org; Wed, 06 Jul 2016 05:48:51 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58420) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKjPg-0000Ot-UB for qemu-devel@nongnu.org; Wed, 06 Jul 2016 05:46:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bKjPg-00072o-2Q for qemu-devel@nongnu.org; Wed, 06 Jul 2016 05:46:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bKjPd-00070I-5K; Wed, 06 Jul 2016 05:46:33 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A620A3F725; Wed, 6 Jul 2016 09:46:32 +0000 (UTC) Received: from localhost.localdomain.com (vpn1-6-81.ams2.redhat.com [10.36.6.81]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u669kPEH013861; Wed, 6 Jul 2016 05:46:30 -0400 From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org, p.fedin@samsung.com Date: Wed, 6 Jul 2016 11:46:00 +0200 Message-Id: <1467798364-9049-3-git-send-email-eric.auger@redhat.com> In-Reply-To: <1467798364-9049-1-git-send-email-eric.auger@redhat.com> References: <1467798364-9049-1-git-send-email-eric.auger@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Wed, 06 Jul 2016 09:46:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC v4 2/6] target-arm: move gicv3_class_name from machine to kvm_arm.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: diana.craciun@freescale.com, shlomopongratz@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Machine.c contains code related to migration. Let's move gicv3_class_name to kvm_arm.h instead. Signed-off-by: Eric Auger Suggested-by: Peter Maydell --- v4: creation --- target-arm/kvm_arm.h | 16 +++++++++++++++- target-arm/machine.c | 16 ---------------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/target-arm/kvm_arm.h b/target-arm/kvm_arm.h index 544e404..4fb6d15 100644 --- a/target-arm/kvm_arm.h +++ b/target-arm/kvm_arm.h @@ -223,7 +223,21 @@ static inline const char *gic_class_name(void) * * Returns: class name to use */ -const char *gicv3_class_name(void); +static inline const char *gicv3_class_name(void) +{ + if (kvm_irqchip_in_kernel()) { +#ifdef TARGET_AARCH64 + return "kvm-arm-gicv3"; +#else + error_report("KVM GICv3 acceleration is not supported on this " + "platform"); +#endif + } else { + return "arm-gicv3"; + } + + exit(1); +} /** * kvm_arm_handle_debug: diff --git a/target-arm/machine.c b/target-arm/machine.c index 2dbeb82..d90943b 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -331,19 +331,3 @@ const VMStateDescription vmstate_arm_cpu = { NULL } }; - -const char *gicv3_class_name(void) -{ - if (kvm_irqchip_in_kernel()) { -#ifdef TARGET_AARCH64 - return "kvm-arm-gicv3"; -#else - error_report("KVM GICv3 acceleration is not supported on this " - "platform"); -#endif - } else { - return "arm-gicv3"; - } - - exit(1); -}