From patchwork Fri Apr 19 06:14:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eduardo Habkost X-Patchwork-Id: 1087956 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44lm7z6xvFz9s3Z for ; Fri, 19 Apr 2019 16:21:19 +1000 (AEST) Received: from localhost ([127.0.0.1]:51945 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHMth-0001yy-RR for incoming@patchwork.ozlabs.org; Fri, 19 Apr 2019 02:21:17 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59512) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hHMnO-0005pm-70 for qemu-devel@nongnu.org; Fri, 19 Apr 2019 02:14:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hHMnN-000567-9k for qemu-devel@nongnu.org; Fri, 19 Apr 2019 02:14:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40426) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hHMnL-00054q-0Q; Fri, 19 Apr 2019 02:14:43 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 44B2588ABB; Fri, 19 Apr 2019 06:14:42 +0000 (UTC) Received: from localhost (ovpn-116-9.gru2.redhat.com [10.97.116.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id CAD46600C1; Fri, 19 Apr 2019 06:14:41 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 19 Apr 2019 03:14:26 -0300 Message-Id: <20190419061429.17695-5-ehabkost@redhat.com> In-Reply-To: <20190419061429.17695-1-ehabkost@redhat.com> References: <20190419061429.17695-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 19 Apr 2019 06:14:42 +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] [PATCH 4/7] arm: Remove special case for "any" CPU model 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: Peter Maydell , Igor Mammedov , qemu-arm@nongnu.org, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We already have an entry for "any" at arm_cpus[], which makes a "any-arm-cpu" QOM type be registered. This means the regular QOM type name lookup code already works and there's no need for a special case. Signed-off-by: Eduardo Habkost --- Cc: Peter Maydell Cc: qemu-arm@nongnu.org --- target/arm/cpu.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 6848d9c94d..dcc65093d9 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1213,14 +1213,6 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) ObjectClass *oc; char *typename; -#ifdef CONFIG_USER_ONLY - /* For backwards compatibility usermode emulation allows "-cpu any", - * which has the same semantics as "-cpu max". - */ - if (!strcmp(cpu_model, "any")) { - cpu_model = "max"; - } -#endif typename = g_strdup_printf(ARM_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); g_free(typename);