From patchwork Thu Nov 5 17:51:46 2020 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: 320647 Delivered-To: patch@linaro.org Received: by 2002:a92:7b12:0:0:0:0:0 with SMTP id w18csp647008ilc; Thu, 5 Nov 2020 09:53:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwN1WfDqUy5EKyRfhcZao1mD2IpP99hekPnKQl5hKXcOBIou8FGwlJSSIWKMA5tNMjbe8bX X-Received: by 2002:a05:620a:4141:: with SMTP id k1mr3313109qko.60.1604598819481; Thu, 05 Nov 2020 09:53:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604598819; cv=none; d=google.com; s=arc-20160816; b=tW5DPBy02WmNLdIp9AQzNpaP1OHwnQdUWlt0AdbRszXkn8Vkn3D4215BJ4ocH2uyq6 G3m0wEyqwPTzZoWUyzTM7++MKYgxxlH7zUXRzz3n350jn8Mew5GKE1WItG7M63q5ZGil 9+Sc2hKlWqoEnpEGBYzUSibLFHovEzXoF3Podq7/4bOijcindnM0xBgKMxLgZYKs6Mm/ h7F+Z8N1zBBidxmbBuHRh8PLMN8Y77QXgPJKrucU39Q0z2vrvWnc/ycgDBQueSHsAuqw cRZcsqRjnqaVYSqnJeZv0wVjTcaeT2juoYRCoT7gEe8swApDxt4C96bDDjkpWxFqtDlP VH5w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Q4/BNah4WCCk/oICyL+pXWdpc8fROe+nhzuyfin8Wc4=; b=udwR2lnldmwVXY5ey3hTyIB4n5JUGmPxtFjkqPM4Suupv5WCs60FxGgIgDamyvpMby rK04Hu2Kpas3FBgrrokRbD9mJ7jF523OW6eW62v7X10pw7e2f+5qrJBTrPnh1o6xXMWI WpIDbk4opTNARCO7clduR+01TQ+HOSAhzC/1aQK7xXoDCxriZBhJMCCv0x83Z5/qO6kZ NeUbUETk5BPAIZgOkmjL+dGjMa8K/QGLQ4ThGunYqxCsRV/Gu8ZIDYziuHAM2AVS2KV2 x0FFewvlXW7M5SpM67UCMETZ0MwmhEUT9I8HQoZE6w4vKFEMlUvj1hSrvh3Lg2V0hfda +SSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="em/jkiqx"; 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 k3si1083202qko.375.2020.11.05.09.53.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Nov 2020 09:53:39 -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="em/jkiqx"; 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 ([::1]:44294 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kajS6-0004Vc-Ul for patch@linaro.org; Thu, 05 Nov 2020 12:53:38 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:34656) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kajQo-0004DO-Cb for qemu-devel@nongnu.org; Thu, 05 Nov 2020 12:52:18 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:51779) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kajQm-0004rg-Ky for qemu-devel@nongnu.org; Thu, 05 Nov 2020 12:52:18 -0500 Received: by mail-wm1-x342.google.com with SMTP id v5so2459651wmh.1 for ; Thu, 05 Nov 2020 09:52:16 -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=Q4/BNah4WCCk/oICyL+pXWdpc8fROe+nhzuyfin8Wc4=; b=em/jkiqxe+irvulRikttAPOMQYUQ0aNRhKPGqdQk+qZqM3Oq2mdS0NozBiHi9rk9RX UEj73oswf+CEpuy5e+pbNnauxYbLIdi2JfejV0SYnA3o68ZZKzpRDFQ37MFo9vivst0b S6Zn2hCeC8kGbgxv3P+qnfcVximpOXzoxDzserEvXPvg6LKG5vs4VGMpHDZtogq1ij4E ZIHYAjzEqYMTjwh/KfBmspQ2fw9hrRPciL8+SU6mgR2kIXQHceZJ+9rnGUbJbJ0r3a8Y bRvGnFTp4pn5J7nBQnQp6nGC2Egq2tuzJTXNhU6FoOMF85FvtdC1SYX+w4DBbDpS1T7F 7Uhg== 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=Q4/BNah4WCCk/oICyL+pXWdpc8fROe+nhzuyfin8Wc4=; b=ZgL6oVu4A9dT3kGjaBaTBI3G0XStjxC5jXQvzA7sRzEZu/XuTkpM5oFQrOm0YWwHmy V0ASArstHb+De6eblzkJVnlyyma8BQJJx0Im0hK0O+qRdN8e3X1Y/sWyRhBDIIwa4ccw ezkoTUhwAFAVkePh0xuscTKug9FacQRu7JJ1Ix6g9fAx9G0aJy8S0B5bM62Tu5wTYmFs UJs6q0ZI1ZHtxyb/Zrn3BU7Q6yG/NDTkTHQhu1MNqZ/TZn36xHCx6SueKGedYTDubThg KjIuZhxiPs550tCzHvyyuddZxWXcdwUJs5N76jtXBG3jML2g4pJOIjOOtWdKGS43vpuM GR9g== X-Gm-Message-State: AOAM5336f7M+R0cWU7PmHQXerJ4ZLSub0FHg+sAdUefTr6kCrpg+ZZy2 30kH83pchjI1iJA8AtLZbxTg0g== X-Received: by 2002:a1c:a952:: with SMTP id s79mr4103730wme.155.1604598735391; Thu, 05 Nov 2020 09:52:15 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e25sm4136670wra.71.2020.11.05.09.51.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Nov 2020 09:52:04 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7D2781FF96; Thu, 5 Nov 2020 17:51:54 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 08/15] meson.build: fix building of Xen support for aarch64 Date: Thu, 5 Nov 2020 17:51:46 +0000 Message-Id: <20201105175153.30489-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201105175153.30489-1-alex.bennee@linaro.org> References: <20201105175153.30489-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::342; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x342.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Stefano Stabellini , julien@xen.org, masami.hiramatsu@linaro.org, Paul Durrant , andre.przywara@arm.com, stefano.stabellini@linaro.org, takahiro.akashi@linaro.org, Anthony Perard , Paolo Bonzini , stefano.stabellini@xilinx.com, =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , stratos-dev@op-lists.linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Xen is supported on ARM although weirdly using the i386-softmmu model. Checking based on the host CPU meant we never enabled Xen support. It would be nice to enable CONFIG_XEN for aarch64-softmmu to make it not seem weird but that will require further build surgery. Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Cc: Masami Hiramatsu Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paul Durrant Fixes: 8a19980e3f ("configure: move accelerator logic to meson") --- meson.build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/meson.build b/meson.build index f5175010df..58e95227ea 100644 --- a/meson.build +++ b/meson.build @@ -74,10 +74,15 @@ else endif accelerator_targets = { 'CONFIG_KVM': kvm_targets } +if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] + # i368 emulator provides xenpv machine type for multiple architectures + accelerator_targets += { + 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], + } +endif if cpu in ['x86', 'x86_64'] accelerator_targets += { 'CONFIG_HAX': ['i386-softmmu', 'x86_64-softmmu'], - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu'], 'CONFIG_HVF': ['x86_64-softmmu'], 'CONFIG_WHPX': ['i386-softmmu', 'x86_64-softmmu'], }