From patchwork Mon Nov 16 12:24:11 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: 324377 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:5ce:0:0:0:0 with SMTP id l14csp3273786ils; Mon, 16 Nov 2020 04:26:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpMyLCKM4JSDP8YszRydi6kSVZusXmJxLS+fJRCAswZt7EUUMAtglPbfgCM/tV2BPf/fVt X-Received: by 2002:a25:428b:: with SMTP id p133mr25868789yba.261.1605529578975; Mon, 16 Nov 2020 04:26:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605529578; cv=none; d=google.com; s=arc-20160816; b=G7wmQ8yEwittpcPTs3d8L9f1eW9INCCmwqZiNuViQugUzUg1yNM3ULP36VGllXWeDJ NE8k0y+0lu2ZKt6rxU0erLN5h80W0bgB4vIucKYuxU+qabZFeyGSVLkVy3OWK2DwNr07 6sAEs+tbXxbprjSDPrjN8huS9xZFy6tnlffKTsKgryzF7YH6z6k+K3wlIxw1FGgdil9f S0jik0oPPErjLyKyNN16q31xhvBRMy1m70x7Io4KUJ7d+yeueDrcXLYVZt/12tMX8QtF zaxJaK5J1xO5J6JjGPtwMlWyWdMaEoGVsURPQJyXm90+esoDjtF74DhikPVTVGWlnKzh XZYg== 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=Q0zxAwcwYBxpBHl7aUkK6beKSxBJqCkVvaQ7o3vFSac=; b=b2Tr91bWyXpwZzNBEQR6Clg6cEI5aM2G/NUg0WdH1OHXgQD0+kcLY6u/OfSToGEKkR EaMUWrCqwqQT3T37hxIPDs1yrCCL57McuypT8mZM9eg0fh0L6vp70TPKKC8svAtqU64/ RpvCkVzXme4cR1SCyqEp0LkDPI7dZHM7YpLIT+6MyhnjrVORR3nRgJfQ1y3pNY/nbGWK vUJkz7hCDvwuPFUsSbh0Zpe+LSA7V+eOl9WjKqYGt8ADSCt7iZpvJIZEdAQqUVR6fwAR JaUUhvV53jTbcswbhlmc88k2ogD+BZLM1Lm4JitcJO/XZJDGZ09kukaTfRnD7fiu8k+o Zemg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=b1pQUa2E; 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 o203si18656421ybg.323.2020.11.16.04.26.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 16 Nov 2020 04:26:18 -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=b1pQUa2E; 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]:51646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kedaM-0001ZB-Fq for patch@linaro.org; Mon, 16 Nov 2020 07:26:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kedYa-0001WQ-19 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:28 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:51511) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kedYX-00037x-1T for qemu-devel@nongnu.org; Mon, 16 Nov 2020 07:24:27 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 19so23545578wmf.1 for ; Mon, 16 Nov 2020 04:24:24 -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=Q0zxAwcwYBxpBHl7aUkK6beKSxBJqCkVvaQ7o3vFSac=; b=b1pQUa2E9nj/YN9o0VLCOXTzklCK3hPL0MK+radCP2iofi+zq1ECqT9GuIdQrA+z3F r7406UPfMi+lMQiabjxqng4HMCAgSTCcyJhm0+Z/yNvWuhG7wo5/r0pI9sZjA+uLTi5e 0jukkH0W5XGY4UHlE5FRIZCdmbaRVWWjgDT3qhS5WeqD74wmGZP5RdYXMno2yHk5KTUU AUKA2bhqDAatPx143RRAfeRl9oJDaCmROu72xhZdNgrs3YwC7SHIAu+Z/IJFWHKNJV8h keEU96AzRFW4OALXIKoOGV/4XYwN987L5CeBIKx/392SYxvZyKUWJLLhy//yGzEUfDlr M/lA== 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=Q0zxAwcwYBxpBHl7aUkK6beKSxBJqCkVvaQ7o3vFSac=; b=ah6uZLBS+TEoxYcivryg1z8jobuKxG4N6i5Imeeat0WR3jiNs/QCwRmyUwonTixAd7 DzAy98hTn31B85E4DPkj3dEZEz4OOo9XbBdSEyPgGf4KxarFTxt+3OY9LBmNSBnWHYcM kJsZrd/798tJU2zw6mjdmTjGLYpw+SMaCi1qeJVwyCfDHs13jscT3sFlfNbXwlSruBFI 4Be7+q8AzJ3gi52/D0/vZVJyRFFFeximRX/uilg0geMjnWqkZEI2NGv2ul4q/xV33q0V ZvwWHwpmGSS0aZfYW38RA63WYSDhTTX0BaVmcnG37HCCD6o7GUv5on2we3hYcjg7MJlz Qfcw== X-Gm-Message-State: AOAM531avbGwSL3CrR1JgTa1OvxfH8Fj8z/iGWJEWVJQJsc5QJNns+ld p267JIZXQS+r9tBOGDln4JCQdg== X-Received: by 2002:a7b:c77a:: with SMTP id x26mr15262421wmk.63.1605529463753; Mon, 16 Nov 2020 04:24:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id e3sm6017716wro.90.2020.11.16.04.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Nov 2020 04:24:21 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 171EB1FF8F; Mon, 16 Nov 2020 12:24:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 3/9] meson.build: fix building of Xen support for aarch64 Date: Mon, 16 Nov 2020 12:24:11 +0000 Message-Id: <20201116122417.28346-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201116122417.28346-1-alex.bennee@linaro.org> References: <20201116122417.28346-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.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 , Masami Hiramatsu , Paul Durrant , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Anthony Perard , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= 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. Fixes: 8a19980e3f ("configure: move accelerator logic to meson") Suggested-by: Paolo Bonzini Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Cc: Masami Hiramatsu Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paul Durrant Message-Id: <20201110192316.26397-4-alex.bennee@linaro.org> -- 2.20.1 diff --git a/meson.build b/meson.build index 61d883bc07..132bc49782 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'], }