From patchwork Tue Jun 14 14:38:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 635362 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 3rTY1Q4lc9z9t12 for ; Wed, 15 Jun 2016 01:08:10 +1000 (AEST) Received: from localhost ([::1]:35944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCpwm-0006gr-H2 for incoming@patchwork.ozlabs.org; Tue, 14 Jun 2016 11:08:08 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49683) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCpUM-0002WQ-PH for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:38:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCpUL-0005Y3-Gw for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:38:46 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCpUL-0005Xp-9a for qemu-devel@nongnu.org; Tue, 14 Jun 2016 10:38:45 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bCpUK-0006Ov-Hi; Tue, 14 Jun 2016 15:38:44 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 14 Jun 2016 15:38:31 +0100 Message-Id: <1465915112-29272-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465915112-29272-1-git-send-email-peter.maydell@linaro.org> References: <1465915112-29272-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH v3 19/20] target-arm/machine.c: Allow user to request GICv3 emulation 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: patches@linaro.org, Shlomo Pongratz , Shlomo Pongratz , Pavel Fedin , Shannon Zhao , Christoffer Dall Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now we have an emulated GICv3, remove the restriction in gicv3_class_name() so that the user can request a GICv3 with -machine gic-version=3 even when not using KVM. Signed-off-by: Peter Maydell Reviewed-by: Shannon Zhao --- target-arm/machine.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target-arm/machine.c b/target-arm/machine.c index 2f45260..2dbeb82 100644 --- a/target-arm/machine.c +++ b/target-arm/machine.c @@ -342,8 +342,7 @@ const char *gicv3_class_name(void) "platform"); #endif } else { - /* TODO: Software emulation is not implemented yet */ - error_report("KVM is currently required for GICv3 emulation"); + return "arm-gicv3"; } exit(1);