From nobody Wed Nov 19 20:22:45 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1702376613; cv=none; d=zohomail.com; s=zohoarc; b=ECPxdvPMf6tyXDqQAr8rOhtZWlWICYv+DswaMCLzY3WzlacNB+ZYvbLWi3Jlzc3PO91RZLFCMVpSjynAL13qkEgZXerAj6AFelMUiMl1gFvlKOidpjC+MaYx4oMcX7J07OqA1sHhk/y5sDA2ljC7doGh6zOX55miXXcujNOW++A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1702376613; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=ucjuuz59Eb5S+ytMt6V/ocgOwnaQyl+aftIQogBEN0k=; b=AGOemtV/NN8sFPoh65eArLZfVQtp2qgNrzjo/lMBZ3JONaf3wFQAACM83lY0KRjMCVLrzcm3if+iDiiuNcaYQ72NED6WyI5lS0QOziiYwi73USSGMLqqsLA+sNzEm9aRPt/1b5EjzAW+2muuv58VcW+/NRSYwJtUE0B+IjKw6BI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1702376613200332.89027408609786; Tue, 12 Dec 2023 02:23:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rCzuF-0006Zf-KP; Tue, 12 Dec 2023 05:22:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCzuC-0006ZL-Au for qemu-devel@nongnu.org; Tue, 12 Dec 2023 05:22:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rCzuA-0007q4-PX for qemu-devel@nongnu.org; Tue, 12 Dec 2023 05:22:24 -0500 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-OlzNfUd5MgiZCSNY7eaSgA-1; Tue, 12 Dec 2023 05:22:20 -0500 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40c31eb65a7so20567315e9.1 for ; Tue, 12 Dec 2023 02:22:20 -0800 (PST) Received: from [10.201.49.8] (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id k18-20020a5d5192000000b0033339027c89sm10469510wrv.108.2023.12.12.02.22.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 02:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1702376541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ucjuuz59Eb5S+ytMt6V/ocgOwnaQyl+aftIQogBEN0k=; b=Cz0rgeahyKUqU6CVGtyQcNdq2bAdTImQRNc/4xBo3VS0yFFTGNNWJhYsHJ6KL3Wif7MzGt yQerdHvjcGXzXPKxeMMkn4uwqx5D+g5zqJDEXptZ36T+dk4HUO1nP6HhSjAmf5OrczOJsG ZoOwQPynNdYbVjl6iL6U0Z7Dk6+q4Mw= X-MC-Unique: OlzNfUd5MgiZCSNY7eaSgA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702376538; x=1702981338; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ucjuuz59Eb5S+ytMt6V/ocgOwnaQyl+aftIQogBEN0k=; b=B8VP03sEOMfRVtB4oLs4wXScJ5Fnjs0bcffvsDIjJizBKhEI1suRk2lLMSX1tgBWO4 1COav4OIF9P+Ax0O28A58yRnVhcPeLwz9gaAXYQOijW8CzW8dIxdqR9Z0L+pvD3I8GJR m2ShMs8be/TH0LTIsHtJ0zWAJwoJVL6jQLau6c51it5nLpYK5/KMlT0pzIbvHIt1ms9a aIfRV+iKHSpeFFe6SqdzKJ6PlwDarv3H+misIZLFhhNQ5MOrhAdhzHCWn0tM3lBWuoPq zIkCYgMOjiOjlHAsYf2PVNiQ5k3UBKsG9kuHchyCPcBJT3IWfLUvP3bP0s6P/ysp1rBS AYWA== X-Gm-Message-State: AOJu0Yy14TChvbR/rIhQXu77LmlS/df4+9xbzHwZOcqVEmkLz1Yqw/Kr bOGEFUU7TVxoxbI7c7aguqWxhQglMCztTqPjvT+21UkB2Y9/RRTpqtCsqS5+LIPRuYPRwzk5vet 8ADMFJylO2rVOUDJrNUAKWAlm32LC4bGiPmfG72ojR3abzcwkgYaMmJSqgoQawJrTVpb8pn5eOK k= X-Received: by 2002:a05:600c:4897:b0:40c:2b49:460d with SMTP id j23-20020a05600c489700b0040c2b49460dmr2830668wmp.135.1702376538338; Tue, 12 Dec 2023 02:22:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IEFeN2Lwjr8K3WhrGezWHhCZ5+gSEoAcmbJQpg0GeWbhJV5NgFvtjWlpFZpqflwycUJqxB9Cg== X-Received: by 2002:a05:600c:4897:b0:40c:2b49:460d with SMTP id j23-20020a05600c489700b0040c2b49460dmr2830652wmp.135.1702376537865; Tue, 12 Dec 2023 02:22:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: philmd@linaro.org, Stefano Stabellini , "Richard W . M . Jones" , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Michael Young Subject: [PULL 1/2] meson, xen: fix condition for enabling the Xen accelerator Date: Tue, 12 Dec 2023 11:22:13 +0100 Message-ID: <20231212102214.243921-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231212102214.243921-1-pbonzini@redhat.com> References: <20231212102214.243921-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1702376614616100002 A misspelled condition in xen_native.h is hiding a bug in the enablement of Xen for qemu-system-aarch64. The bug becomes apparent when building for Xen 4.18. While the i386 emulator provides the xenpv machine type for multiple archit= ectures, and therefore can be compiled with Xen enabled even when the host is Arm, t= he opposite is not true: qemu-system-aarch64 can only be compiled with Xen sup= port enabled when the host is Arm. Expand the computation of accelerator_targets['CONFIG_XEN'] similar to what= is already there for KVM. Cc: Stefano Stabellini Cc: Richard W.M. Jones Cc: Daniel P. Berrang=C3=A9 Reported-by: Michael Young Fixes: 0c8ab1cddd6 ("xen_arm: Create virtio-mmio devices during initializat= ion", 2023-08-30) Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- meson.build | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index ec01f8b138a..67f4ede8aea 100644 --- a/meson.build +++ b/meson.build @@ -123,21 +123,24 @@ if get_option('kvm').allowed() and targetos =3D=3D 'l= inux' kvm_targets_c =3D '"' + '" ,"'.join(kvm_targets) + '"' endif config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) - accelerator_targets =3D { 'CONFIG_KVM': kvm_targets } =20 +if cpu in ['x86', 'x86_64'] + xen_targets =3D ['i386-softmmu', 'x86_64-softmmu'] +elif cpu in ['arm', 'aarch64'] + # i386 emulator provides xenpv machine type for multiple architectures + xen_targets =3D ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'] +else + xen_targets =3D [] +endif +accelerator_targets +=3D { 'CONFIG_XEN': xen_targets } + if cpu in ['aarch64'] accelerator_targets +=3D { 'CONFIG_HVF': ['aarch64-softmmu'] } endif =20 -if cpu in ['x86', 'x86_64', 'arm', 'aarch64'] - # i386 emulator provides xenpv machine type for multiple architectures - accelerator_targets +=3D { - 'CONFIG_XEN': ['i386-softmmu', 'x86_64-softmmu', 'aarch64-softmmu'], - } -endif if cpu in ['x86', 'x86_64'] accelerator_targets +=3D { 'CONFIG_HVF': ['x86_64-softmmu'], --=20 2.43.0