From patchwork Fri Jun 17 14:25:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 9184403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A2B7A608A2 for ; Fri, 17 Jun 2016 15:21:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94E46283BE for ; Fri, 17 Jun 2016 15:21:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8791A283BF; Fri, 17 Jun 2016 15:21:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7C4B6283BD for ; Fri, 17 Jun 2016 15:21:02 +0000 (UTC) Received: from localhost ([::1]:58314 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDvZt-00048C-IN for patchwork-qemu-devel@patchwork.kernel.org; Fri, 17 Jun 2016 11:21:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDuij-0005yk-JL for qemu-devel@nongnu.org; Fri, 17 Jun 2016 10:26:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bDuii-0002vR-NU for qemu-devel@nongnu.org; Fri, 17 Jun 2016 10:26:05 -0400 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:57892) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bDuii-0002uw-H5 for qemu-devel@nongnu.org; Fri, 17 Jun 2016 10:26:04 -0400 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.84_2) (envelope-from ) id 1bDuih-0008AI-SB for qemu-devel@nongnu.org; Fri, 17 Jun 2016 15:26:03 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Fri, 17 Jun 2016 15:25:49 +0100 Message-Id: <1466173552-25482-20-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1466173552-25482-1-git-send-email-peter.maydell@linaro.org> References: <1466173552-25482-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] [PULL 19/22] 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: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Tested-by: Shannon Zhao Message-id: 1465915112-29272-20-git-send-email-peter.maydell@linaro.org --- 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);