From patchwork Thu Jun 13 06:07:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 10991139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9CB7E112C for ; Thu, 13 Jun 2019 06:18:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81F3728B24 for ; Thu, 13 Jun 2019 06:18:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 735A328B2C; Thu, 13 Jun 2019 06:18:11 +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=-5.0 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 28CF528B24 for ; Thu, 13 Jun 2019 06:18:11 +0000 (UTC) Received: from localhost ([::1]:37146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbJ3q-0003xs-HW for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Jun 2019 02:18:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33638) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hbJ08-0000i2-2L for qemu-devel@nongnu.org; Thu, 13 Jun 2019 02:14:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hbIts-0000lb-VB for qemu-devel@nongnu.org; Thu, 13 Jun 2019 02:07:54 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:39287) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hbItp-0000XA-C2 for qemu-devel@nongnu.org; Thu, 13 Jun 2019 02:07:52 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 45PYDg5qhGz9sN4; Thu, 13 Jun 2019 16:07:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1560406051; bh=VV/5ghX6HCg00ETVsmnfiUbadw2OSQO1ASJ7zZQcKtY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=om3RpChNCG5T+ukaqh5arKqjrXTiaul5fRc4qoVpcZW0LwAoBLKoCBVva9LoPMflA qp1ngUbGN6UGWpQbxRkvKQlVoDljn6E6izfc0Mi5zPczXNklbQT/fPeKL10JiLVk+s QyFkSx2+1U2E5Z+tZtemR9YuR9GP6xP+wk/61Hi0= From: David Gibson To: crosa@redhat.com, qemu-devel@nongnu.org, arikalo@wavecomp.com, aurelien@aurel32.net, ehabkost@redhat.com Date: Thu, 13 Jun 2019 16:07:27 +1000 Message-Id: <20190613060728.26955-3-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190613060728.26955-1-david@gibson.dropbear.id.au> References: <20190613060728.26955-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PATCH 2/3] tests/acceptance: Handle ppc64le host arch correctly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP ppc64 and ppc64le are different archs from the host kernel point of view and are advertised as such in uname. But these cover the same set of CPUs, just in different endianness modes. qemu-system-ppc64 handles both modes, so make sure we select the correct binary when running on ppc64le host architecture. Signed-off-by: David Gibson Reviewed-by: Philippe Mathieu-Daudé --- tests/acceptance/avocado_qemu/__init__.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index 2b236a1cf0..0ba9c536f4 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -39,6 +39,8 @@ def pick_default_qemu_bin(arch=None): """ if arch is None: arch = os.uname()[4] + if arch == 'ppc64le': + arch = 'ppc64' qemu_bin_relative_path = os.path.join("%s-softmmu" % arch, "qemu-system-%s" % arch) if is_readable_executable_file(qemu_bin_relative_path):