From patchwork Mon Feb 11 13:05:05 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: 158004 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp2593454jaa; Mon, 11 Feb 2019 05:22:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IZXP1GVbcTp3LMN+Ae1iqhoqaJ3OTYfbXqIWZNuFrQ2a+lT/EK4p0q99EodXjyRZYFQ+vOP X-Received: by 2002:a81:4ac6:: with SMTP id x189mr28560321ywa.249.1549891362454; Mon, 11 Feb 2019 05:22:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549891362; cv=none; d=google.com; s=arc-20160816; b=fDTDC2T8pphXCOX7B58KtuVfNHVn162qXtCDjApIloLHgEeqFeoZSeLtXABlxguFRE geWeTAo6d+QyNGXdFFsbCYNzIFdNO44MypJQiwKXhvqyXmFwGUnOIX6OZMRm1GWF/AWa yMK1t82k/LCXz89LlgqQ4auRoTkNJxk258mT0jf6XRKq3lqd3iDsfOj/peP6hl6xMLAF GBlt3VgJBwXgfS1C3WrkZRYUWihxgjArSQBD/gVjbL7PaaRk/PjbbZlqDecmY8vMgimd yehDX3UuGxX0kPvPtxgFZSfhcwXBk3Op5VTCnJIJ0CrqpKW+0FarNCzZuS2wleiOEHcl 8rSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=1vPprptAUo+PfFXMQ/irpBZhbxCI/5X6gbXjJfvsHD0=; b=heLSOCKVRoruWpdd91dsKmp+IysE0fdrAWEhkT8edOcThvKyMOs2XZFWu0N8I50zIE zDb7tFA4xoBd+41Jtw0awVPnhFuXVFEq6X0xD0Jn7qFL9BfXIdMjHcnqaO+Sz9a3pCMR giCSuWUxQuewkFADzL9+yfbkWmBdrnJVZRG98eAxmB+C7WWOMWdIpr6ib19e7iYnuXYl KcXqk45XW/rL6+4kGIIgrTO1NoKZWfHRajnYE8qmegSPuG+K0v9xhLNSmQVBF32c0hFC 0iASYEFH1gjWGO3tN9vbvN5xTC4x5t1gC+ORiLkU5bOD/Hy9D7ZyckCMjij43erKt8B8 j5cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fhkIxTTh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id h189si5959859ywe.165.2019.02.11.05.22.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 11 Feb 2019 05:22:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fhkIxTTh; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:50175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBXm-0002hQ-14 for patch@linaro.org; Mon, 11 Feb 2019 08:22:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52638) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gtBOX-0004YH-Ss for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gtBOW-00009v-8U for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:09 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:39315) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gtBOW-000090-1f for qemu-devel@nongnu.org; Mon, 11 Feb 2019 08:13:08 -0500 Received: by mail-wm1-x329.google.com with SMTP id f16so17208130wmh.4 for ; Mon, 11 Feb 2019 05:13:07 -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=1vPprptAUo+PfFXMQ/irpBZhbxCI/5X6gbXjJfvsHD0=; b=fhkIxTThkdr55mNPNTxM90fclH69efMHR7146mwAYiZasvb5xp7ByxzYmfIDQ86cR/ Zv0YIJ/LFMvs7Sf2VGXRMZv1PODdGTHA+wz4RjoOAATxTWQCl+3tArBmeUD+s+6jKDS5 RaU70DIu8PJ3jQvaJhprrs1e4VJHyd3q3R0nSFxEhKfw+uoK/nSDWtICjcrZTS+U+h9K LHIw435sdpZZnpvt4qQC/ILS0emqUieQAHdZRbMDglnkKWs4Q7dC3TrwHzTyIHX3QdFO nZDpXNTseamVa8cfBrlZiFgzuTw59qqhXYjXuVfR+kFhvv1U4DaeBqWVGjCbuN6YHxRR klxQ== 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=1vPprptAUo+PfFXMQ/irpBZhbxCI/5X6gbXjJfvsHD0=; b=jWthK7N6t1eOok/rn3fxjqsdSDOSZuW/EBZjeiA0LtKQ3EHRXYFJQyi9hKSbilRfL1 1K40eLJthNWaNkAIHfZA1ud6bTlwC9zY21S4DNSm9hv6uiCT00KecLtaagK7i5wUOu9P NhM04p4syps4x1e7W6Wets91LRW5hyXjFiQRDiUT8B/O6iFvwq3mIBri+gu8Eif/VkUk 7F00MTdK8+bfZ8CLueAM9MPCodvzXfpfA5yd7oLv1JVRqm4vn/GcbPrGDPfGOhzw+B4q LfMAi4FonJqgm4jVTLc1oU7FaIrkE2FWdih07W5kCeKUjfMgCN3szrFNvJVvan8mNpQx +Cdg== X-Gm-Message-State: AHQUAuYBUFfKvs5jggysQ0R+/Y3nwmAbhvmmYLq9lhfDJbq0BXNVbaDa W+nmj7OHNZfcZOxTXYSoe/hXifI2I00= X-Received: by 2002:a1c:c303:: with SMTP id t3mr8466443wmf.94.1549890786878; Mon, 11 Feb 2019 05:13:06 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m4sm11570791wrq.6.2019.02.11.05.13.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Feb 2019 05:13:04 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CE3941FF90; Mon, 11 Feb 2019 13:05:07 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Mon, 11 Feb 2019 13:05:05 +0000 Message-Id: <20190211130507.8710-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211130507.8710-1-alex.bennee@linaro.org> References: <20190211130507.8710-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::329 Subject: [Qemu-devel] [PULL 16/18] 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?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.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 -- 2.20.1 diff --git a/scripts/qemu.py b/scripts/qemu.py index 0a5e02eb56..32b00af5cc 100644 --- a/scripts/qemu.py +++ b/scripts/qemu.py @@ -25,10 +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]: - return False + host_arch = os.uname()[4] + if target_arch and target_arch != host_arch: + if target_arch != ADDITIONAL_ARCHES.get(host_arch): + return False return os.access("/dev/kvm", os.R_OK | os.W_OK)