From patchwork Fri Jan 25 14:00:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 1031111 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=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="EsZu9yBB"; dkim-atps=neutral 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 43mLbM1FSWz9s55 for ; Sat, 26 Jan 2019 01:13:19 +1100 (AEDT) Received: from localhost ([127.0.0.1]:45351 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn2EP-0005AX-1k for incoming@patchwork.ozlabs.org; Fri, 25 Jan 2019 09:13:17 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54130) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gn28z-0000nH-PB for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:07:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gn28x-0004Yd-UD for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:07:41 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:47029) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gn28w-0004Q9-Gk for qemu-devel@nongnu.org; Fri, 25 Jan 2019 09:07:39 -0500 Received: by mail-wr1-x442.google.com with SMTP id l9so10385441wrt.13 for ; Fri, 25 Jan 2019 06:07:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c+KjY4GXbPnP7Qx/tQakWL6Rvb+riTHS2+DauNnbB1I=; b=EsZu9yBBx2lHQ5j0mHDyNVG7wh1YLfrGjODiUUjEX41tehjroCZgEIUXqB3+2G7DlN TbtaLWCAc3HITmGbPPnFEadywdx1M3KZ1Xa8995yTc+t1oCLMFqQZPKuVQ/KCd1L4on5 t0szoO27jqHAcPUz37cfxJCnXBgnIf9jkhE5k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c+KjY4GXbPnP7Qx/tQakWL6Rvb+riTHS2+DauNnbB1I=; b=A89rxOWI5XNSdVHTcpkn2C6oPHLl+1aNzD9QBS8Bh0yUAo//50SSmBhz0vec5cg3PX 99V18beAf/AtjlVAAwpZ8gKskCL0SrwagPBy1r6exMoXtMMfasz1gGl8chzsfsVPGmjc pJJKdozNqNvEmJizDrV0pwtQ5crpwlE8mDXIwDRvnDZ6CIyi3YX8gcqMcjIW2tysqt5F c0wIuDVEbAdw8vgSC70Ld1dRaTsxTIX3An5fOzl76nNmBwMCYadZbkPkwZevhyyZOJLV au2U+1PX3DkLO+bYnOm/5agg9l2o76L/Onw3sKYXV7BC9nHvFetUO1jh8Kvv4qVHjKn2 kn4Q== X-Gm-Message-State: AJcUukeeOv0Kqdye4EYrTyQDNZxKKrOVYwb74Ij/oBDhy3fjfTMWDBve yBUCNRgE+VJOCzQ/FPRfUitZ3A== X-Google-Smtp-Source: ALg8bN6df4GXW8ckVQIoZ9ddHiq0La0Bigc3LS3gV6KIBQ7aWj4btcSQBHA9icrwS84V6rEFkJkoBw== X-Received: by 2002:a5d:6b81:: with SMTP id n1mr12445757wrx.149.1548425249102; Fri, 25 Jan 2019 06:07:29 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x81sm65370534wmg.17.2019.01.25.06.07.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 25 Jan 2019 06:07:28 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id C03C03E0B02; Fri, 25 Jan 2019 14:00:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Fri, 25 Jan 2019 14:00:17 +0000 Message-Id: <20190125140017.6092-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125140017.6092-1-alex.bennee@linaro.org> References: <20190125140017.6092-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v1 14/14] scripts/qemu.py: allow arches use KVM for their 32bit cousins 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: =?utf-8?q?Alex_Benn=C3=A9e?= , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" A lot of architectures can run their 32 bit cousins on KVM so the kvm_available function needs to be a little less restricting when deciding if KVM is available. Signed-off-by: Alex Bennée --- scripts/qemu.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/scripts/qemu.py b/scripts/qemu.py index 0a5e02eb56..2934ee12c5 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -25,9 +25,18 @@ import tempfile LOG = logging.getLogger(__name__) +# Mapping host architecture to any additional architectures it can +# support which often includes its 32 bit cousin. +ADDITIONAL_ARCHES = { + "x86_64" : "i386", + "aarch64" : "armhf" +} def kvm_available(target_arch=None): - if target_arch and target_arch != os.uname()[4]: + host_arch = os.uname()[4] + if target_arch and target_arch != host_arch: + if target_arch == ADDITIONAL_ARCHES[host_arch]: + return True return False return os.access("/dev/kvm", os.R_OK | os.W_OK)