From patchwork Tue Apr 30 06:37:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Rigby X-Patchwork-Id: 240563 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3D9BB2C00C6 for ; Tue, 30 Apr 2013 16:39:47 +1000 (EST) Received: from localhost ([::1]:37477 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UX4E3-000568-Hc for incoming@patchwork.ozlabs.org; Tue, 30 Apr 2013 02:39:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54348) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UX4Ct-00044b-UA for qemu-devel@nongnu.org; Tue, 30 Apr 2013 02:38:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UX4Cp-0003ZR-1q for qemu-devel@nongnu.org; Tue, 30 Apr 2013 02:38:31 -0400 Received: from mail-da0-x232.google.com ([2607:f8b0:400e:c00::232]:48612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UX4Co-0003Yn-SD for qemu-devel@nongnu.org; Tue, 30 Apr 2013 02:38:26 -0400 Received: by mail-da0-f50.google.com with SMTP id a4so107533dad.37 for ; Mon, 29 Apr 2013 23:38:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=bkX8QfYsH2m1GHNFuWJiqt1A4o+hxu3Q7IVkheMcNFQ=; b=Io4unYPyAaXwjqZ+4h2ObHhdXqk/TckcFSwhk2GeAIdMnlI/Pd8XZkzEmzLoD0tp98 jeA4gNZDTJKjAvwjP74LlMXL+d+ijK8G7fy+DktfIw88uGrxl5m3CpnrgqRoUv+Lv3D6 +4NT0FGHdL/JaRi6DaOzVjne261e9osKikRAvfS3QidwIOvQ5bCuk672RaoDUpKUTfuj n634QwFD0eRZAAI4Qf5L76WqjnHmtOeo8iDGvC9zUCt+LEDei/4rExtWh+pUpdQwbG+y IdI2olo9g6YPLGkmgV1/zv1msN5lQQkvFuFtSaNrN9h4DVDlNoWxpZolyx8ASEa+437C Y1EQ== X-Received: by 10.68.163.225 with SMTP id yl1mr25110469pbb.0.1367303906049; Mon, 29 Apr 2013 23:38:26 -0700 (PDT) Received: from localhost.localdomain (c-76-23-54-220.hsd1.ut.comcast.net. [76.23.54.220]) by mx.google.com with ESMTPSA id to7sm29308861pab.0.2013.04.29.23.38.23 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 29 Apr 2013 23:38:25 -0700 (PDT) From: John Rigby To: qemu-devel Date: Tue, 30 Apr 2013 00:37:35 -0600 Message-Id: <1367303855-9666-1-git-send-email-john.rigby@linaro.org> X-Mailer: git-send-email 1.7.3.3.398.g0b0cd X-Gm-Message-State: ALoCoQm0o5k1gE8g3HpYgc/gcvDNDULUdwK47gCy78gciINe25MPaJZ3J3d8Da2ZXIU7laoD6qxY X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c00::232 Cc: Peter Maydell , Alexander Graf , Riku Voipio Subject: [Qemu-devel] [PATCH v2 05/12] linux-user: Don't treat aarch64 cpu names specially X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Alexander Graf 32-bit ARM has a lot of different names for different types of CPUs it supports. On AArch64, we don't have this, so we really don't want to execute the 32-bit logic. Stub it out for AArch64 linux-user guests. Signed-off-by: Alexander Graf --- linux-user/cpu-uname.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/linux-user/cpu-uname.c b/linux-user/cpu-uname.c index 59cd647..89bdb91 100644 --- a/linux-user/cpu-uname.c +++ b/linux-user/cpu-uname.c @@ -30,7 +30,8 @@ * return here */ const char *cpu_to_uname_machine(void *cpu_env) { -#ifdef TARGET_ARM +#if defined(TARGET_ARM) && !defined(TARGET_AARCH64) + /* utsname machine name on linux arm is CPU arch name + endianness, e.g. * armv7l; to get a list of CPU arch names from the linux source, use: * grep arch_name: -A1 linux/arch/arm/mm/proc-*.S