From patchwork Thu Dec 21 17:19:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=SdVbcwIb; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swxyz02lwz1ySd for ; Fri, 22 Dec 2023 04:20:42 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMiR-0007Vz-Le; Thu, 21 Dec 2023 12:20:11 -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 1rGMiP-0007Vc-84 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiN-0004SA-Pw for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qMPfuQKYh8RDla6S4U2P4p48I7GyoAc7S/H6lEUsjtA=; b=SdVbcwIbRrcXq6ZxRogKAEkJsuyaElmegWvq6TXB1c9764Z6QMg8WjrU/H5v9XnQ215BY7 iyJr5SKfid9S5p/I1UR08WJwAixUkecZ1xfV6nd3/ojOGFo76IQkfz6LLH3rpzUN9YtCUX HGSR4KB7nY28zL4bH0ZkSxVkNrWMkgs= Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-592-zED4vYBvO5ybCmksR4rzQg-1; Thu, 21 Dec 2023 12:20:04 -0500 X-MC-Unique: zED4vYBvO5ybCmksR4rzQg-1 Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-50e4aa3f7eeso1174428e87.1 for ; Thu, 21 Dec 2023 09:20:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179202; x=1703784002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qMPfuQKYh8RDla6S4U2P4p48I7GyoAc7S/H6lEUsjtA=; b=BzKQS1TQkt64r3vUx2TapqfDaymxvEnKSvvOlD4KIqCi9aBCpx7IOZm0CvsgiGWWfo D/rJkcCEi7rxMU9lpGfQFwHzjyGj67qt+xtUJbd/XJWTtSdn+9eH9cCJLWeNtzVGVVhu dqKD9XySzXxvlDG+uo6lzKcAzOpgzM4QGu3oFG6VsbjgfD/soV6WexN/9rbKUAf/kbKz mYAdWSilSjWNQ0o9GmO8BV/zbhmuSwVRrB3Rk22RtxG71MJnZnPvMGguz+dPA4/oE2Yf rAWJBBz8zV9kCEZ4A4du85licp5mfr76BZkJDOtbon7wkPoE4HKwXHBL2NnX2/kHzXUZ +c4Q== X-Gm-Message-State: AOJu0Yw4iS3eexWvWparRqmG3OkT946QiwdD31Zi0btEmBqJktDebHfz Ab8BQa6jhiDb8feifqvDRzVCM/oet6mEo6Kn4d07DgMr5gCb7Z7MrJ5JwZ/aAaalcypkv69avmn PhvuA8EXIdmVA/I8HxrYS2n6Wsf8g1c6gVVbaK1EUGTvj7CnGryLTcx/zo0kIWVbMhqL11Ft9yW riew/TZbI= X-Received: by 2002:a19:700c:0:b0:50e:433e:c95e with SMTP id h12-20020a19700c000000b0050e433ec95emr5253lfc.32.1703179202548; Thu, 21 Dec 2023 09:20:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9WguVIYVPGn/XjS+vmocQZSNIX1XLwgCjy/z3xySaD2EDQg9a1LGs2HLgd91BmL8AQ4S6Yw== X-Received: by 2002:a19:700c:0:b0:50e:433e:c95e with SMTP id h12-20020a19700c000000b0050e433ec95emr5242lfc.32.1703179202042; Thu, 21 Dec 2023 09:20:02 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id m17-20020ac24ad1000000b0050e36ba7a52sm317108lfp.67.2023.12.21.09.20.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:01 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 01/21] meson: fix type of "relocatable" option Date: Thu, 21 Dec 2023 18:19:38 +0100 Message-ID: <20231221171958.59350-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Since the option is of boolean type, the default value should be a boolean rather than a string. Signed-off-by: Paolo Bonzini --- meson_options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt index c9baeda6395..0a99a059ec8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -101,7 +101,7 @@ option('cfi_debug', type: 'boolean', value: false, description: 'Verbose errors in case of CFI violation') option('multiprocess', type: 'feature', value: 'auto', description: 'Out of process device emulation support') -option('relocatable', type : 'boolean', value : 'true', +option('relocatable', type : 'boolean', value : true, description: 'toggle relocatable install') option('vfio_user_server', type: 'feature', value: 'disabled', description: 'vfio-user server support') From patchwork Thu Dec 21 17:19:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879300 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=eZIXClOW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1H1ySvz1ySd for ; Fri, 22 Dec 2023 04:22:43 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMic-0007ZL-Pd; Thu, 21 Dec 2023 12:20:22 -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 1rGMib-0007Yb-CE for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:21 -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 1rGMiO-0004SM-L2 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179207; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YqVi++Kwt0Mq/jHDdFR9I7zkYuN87hUwBjZExhWjvrA=; b=eZIXClOWglA28xKi/pxh+2xksv6c7aj5up4V566iasJaqAqzSdD5JQvbtUbxvF2xSvCa/0 Rps9hbh6owcQjxE68L6ZjoTBcYrA97j63fApfzgbSBIn6Vk75tspVjqRCRT/oKJLc3tABf 8zRy+zW1dQk4ZwU1KBj3I16ROA11AlQ= Received: from mail-lf1-f72.google.com (mail-lf1-f72.google.com [209.85.167.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-145-Irrs4epbMMC_QaWlQLNaGw-1; Thu, 21 Dec 2023 12:20:06 -0500 X-MC-Unique: Irrs4epbMMC_QaWlQLNaGw-1 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-50e30efbcf2so562975e87.1 for ; Thu, 21 Dec 2023 09:20:05 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179204; x=1703784004; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YqVi++Kwt0Mq/jHDdFR9I7zkYuN87hUwBjZExhWjvrA=; b=TvIT5fXDR6jUBN4ZOfYIrr4ReiungwRh7DNaQ0C4yCpjCwV+BiyL3BadOWKJdP1C2N FcBifaQ8D72k3mQ4tKoMTzEZGoWZC65OqBjAW6eDIxTna/XD+zRGwepZQ3Ww+OW27EnC v917fVG2SSzBel2Q0VDuzmx/Xj02aKxhNhRq3CHW0IYIShV/wgBy5JmHbdDPASr1Sehc z1Wct6PrikjZ6KZqro/rzYuFz/gRgeJyL+Yyi81POsaShfisJwtXzSk+pDArDZ84b6no tYkc0FllB5x5h6NQS1168GSw6DkIOSeqSFZJeKWQmzE75iHR3pDe869IE9ONuMDWx15m l+lQ== X-Gm-Message-State: AOJu0YzyqEjcUWbuo9SgQqVHqU9shlcdFY4IYigOgVcl77xGTL2ceTvP BgsHFealnfXw6yxUUTUjDfBqtLvosrg64rnAzenNsrxnSYEqM1DZ13ofIWuMfb3pZKSfK5fkxqN UHuiejV1pBbFLwJk1n78+Vi0bVay/PIolMas2MXJCOPX2Q6S0/tutlDAKR9U1lc0rv/GbaE6T4d CT2O9FmR4= X-Received: by 2002:ac2:5fcd:0:b0:50e:4b1f:5ddb with SMTP id q13-20020ac25fcd000000b0050e4b1f5ddbmr10853lfg.16.1703179203973; Thu, 21 Dec 2023 09:20:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEkr9u1DakS/bVdSp9fZvI/7Ic07yvLjPs7qe5WLrKdcxi0ulZlEDJ4xGA9S7MKxI9+5443hg== X-Received: by 2002:ac2:5fcd:0:b0:50e:4b1f:5ddb with SMTP id q13-20020ac25fcd000000b0050e4b1f5ddbmr10846lfg.16.1703179203684; Thu, 21 Dec 2023 09:20:03 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id a4-20020a056512020400b0050e0d35e41dsm317297lfo.266.2023.12.21.09.20.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/21] meson: remove unused variable Date: Thu, 21 Dec 2023 18:19:39 +0100 Message-ID: <20231221171958.59350-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- tests/bench/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/bench/meson.build b/tests/bench/meson.build index 3c799dbd983..7e76338a52d 100644 --- a/tests/bench/meson.build +++ b/tests/bench/meson.build @@ -3,9 +3,9 @@ qht_bench = executable('qht-bench', sources: 'qht-bench.c', dependencies: [qemuutil]) -qtree_bench = executable('qtree-bench', - sources: 'qtree-bench.c', - dependencies: [qemuutil]) +executable('qtree-bench', + sources: 'qtree-bench.c', + dependencies: [qemuutil]) executable('atomic_add-bench', sources: files('atomic_add-bench.c'), From patchwork Thu Dec 21 17:19:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879289 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=gpLLUEzN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SwxzJ0YsFz1ySd for ; Fri, 22 Dec 2023 04:21:00 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMiW-0007WU-Sa; Thu, 21 Dec 2023 12:20:17 -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 1rGMiT-0007W3-3e for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:13 -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 1rGMiQ-0004Sh-CZ for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179209; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7KHsaL4UQVL7EB67oxOli3jIm09+5F03qAdq+7G5z8A=; b=gpLLUEzN0/QBqmeyC5URdXay15y6m26kFt4PLmPyR5q+6fMx0QKa19QYsI+RlIoKpDsyse iOhqdiCkXRWitZ2LNnN7/U28Lc4bOGo83P/zt/JW6BboD6dnxWz2LApX0DYGU0xL0UOSVK azVDg1qWBqr5ZcNqeQMRNcYrPqHDqeY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-397-qHULxM2mPBu4aY2SN65ZFA-1; Thu, 21 Dec 2023 12:20:08 -0500 X-MC-Unique: qHULxM2mPBu4aY2SN65ZFA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40d39a425bbso7559455e9.3 for ; Thu, 21 Dec 2023 09:20:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179206; x=1703784006; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7KHsaL4UQVL7EB67oxOli3jIm09+5F03qAdq+7G5z8A=; b=uQQyNy8KswTaFshf5Y84+NkLRzRwhbKw6zv5gnWadt56hsxPtbZHPnOsxNVHQ6u/1V btTNjrvuj/qQZ5/P+O6PolIf4Dv9KxtAdJD3GNYETl9qp99c3koZlXoS8IJ+muG7ZJ3P BHzPUdT21YJxLudd+Ad8nawy+Vfl9rxdsYdZtmkJZPwWu1cGhWAP0om87yzadkGy64Vy QE2WfepWyXsi9zuu5Hp6Fz6gVhDx9dw+Zm0WJ/m7OSC3QKQEiAJ6w7fSVg/tcI1vzk60 t7JohfI4P4EvBF2VIb+1FwuDb9h3JWCrD2v5uAYFm8eUyEXJPt6PQZI29XerRa8gM6ur I9QA== X-Gm-Message-State: AOJu0YxzDUkNozhaiHywtKjWWPIZLuEnY3afXMfupMlD2CvWF1VO+Q7l XKnGKywSg8SpgknenMzBEeZqUOjSwZU39Bo5I35xnK3Q/ulQ0tATKyfsThtBrha9SBPuN2IQHHs INUBYVLgVKuzyJ8xMUtG6e+U+LSekCGOnXxYo2n6YlyVcaW6S7DaRWOl8+x8RvXoWQeyRupjQB9 s0hWPSVoY= X-Received: by 2002:a7b:c3c6:0:b0:40d:3c5d:b2e3 with SMTP id t6-20020a7bc3c6000000b0040d3c5db2e3mr42271wmj.81.1703179206212; Thu, 21 Dec 2023 09:20:06 -0800 (PST) X-Google-Smtp-Source: AGHT+IFgRCM8MSsEZYKAuSpXQ5DEHlq5cOxLBFTe/7kgCyBhh1v8yzD64apT6H/xmCeCJCrH5BS/Ew== X-Received: by 2002:a7b:c3c6:0:b0:40d:3c5d:b2e3 with SMTP id t6-20020a7bc3c6000000b0040d3c5db2e3mr42268wmj.81.1703179205801; Thu, 21 Dec 2023 09:20:05 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id b6-20020adfee86000000b00336344c3c3fsm2448885wro.90.2023.12.21.09.20.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 03/21] meson: use version_compare() to compare version Date: Thu, 21 Dec 2023 18:19:40 +0100 Message-ID: <20231221171958.59350-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org While a simple lexicographic comparison usually works, it is less robust than a more specific algorithm designed to compare versions. Signed-off-by: Paolo Bonzini --- qga/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qga/meson.build b/qga/meson.build index ff7a8496e48..a6af614891a 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -140,7 +140,7 @@ if targetos == 'windows' qemu_ga_msi_vss = ['-D', 'InstallVss'] deps += qga_vss endif - if glib.version() < '2.73.2' + if glib.version().version_compare('<2.73.2') libpcre = 'libpcre1' else libpcre = 'libpcre2' From patchwork Thu Dec 21 17:19:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879293 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=X3tE/L58; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy0J1ZhPz20Gb for ; Fri, 22 Dec 2023 04:21:51 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMiX-0007X9-Km; Thu, 21 Dec 2023 12:20:18 -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 1rGMiU-0007WI-FJ for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:14 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiT-0004T3-1F for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179211; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cw7+dRbN4+JtYElIwq4s0tub6i06l9lq5JRTHfcReyg=; b=X3tE/L58b7hElqBUWk4X3Ba7FF9Z7UaR09fWHFZyhCL9191OWU7G+DLYyeFCIKbujaeNjT n4BZvyfXArXo2AJPaGyuo6CaUgvmWiCdLe2ISacl2gwAid1lBrCqlTDvDUstsrfu9j5yet e94rCKEr2XIgs44QW31r9+KOlqLrczI= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-470-ANH_Ne4_Mf2BgYMD8cPjxQ-1; Thu, 21 Dec 2023 12:20:10 -0500 X-MC-Unique: ANH_Ne4_Mf2BgYMD8cPjxQ-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c495a9c7cso7814335e9.3 for ; Thu, 21 Dec 2023 09:20:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179208; x=1703784008; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cw7+dRbN4+JtYElIwq4s0tub6i06l9lq5JRTHfcReyg=; b=QzugXZdDA1//dld0orfDvVDVkGXn0pZ2B8n4rsGIDmwUvQpUC2mGBP/YBnucUcjQF0 iJInuaaQWccHhiL0Po3tyOx8hCqASsLKxggQvVxnVw1buwo3foQnJPE+LOISWBFGu17j s0V8XHbMK/wyXqGsZ9V7EjxBwGCypwuK/J8d41xyuHaLfUu7OimucZrwMIyNMczNAVQb XAfGDT2EosUcMTKd3qv3KphSnnvVJ/gc9DmFm83De48RVD+8Bc6ePZ2UG4/GgGg1jNTv MbVCI95ROspiflbr2OZ0rgVIemlxFFPBkO9d/PArC7ltv/hCbu6/mGjttFP+EW/Uq+C0 akEA== X-Gm-Message-State: AOJu0YyXtLv79AC87kzvQN3GZoL+C/u0dkZsU8n0KVxIaNMfMRvc9S8S SbNcOu0MWyLRsZF9dXzPOggBzaZIMWgaq7zMi2tlvZghHEE0ArrYkJfWUQ0aueYjCGiq/RP34Dh 9QX6izvYHbo84OvCqvPsUPYAZvqYlMuEw0LidKP+uo8WFn7+smxJcnTNRIuQ54Uyj6akb8yux+W 2i0hF3epw= X-Received: by 2002:a05:600c:1c06:b0:40c:2cc5:4541 with SMTP id j6-20020a05600c1c0600b0040c2cc54541mr39746wms.39.1703179208341; Thu, 21 Dec 2023 09:20:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXdf2aVsrhHizYJoSs1xE2QKtSHXHp+yZzu9TJtHcL6INqqcpw/mTm4rmYiYStx6+omo/Pdg== X-Received: by 2002:a05:600c:1c06:b0:40c:2cc5:4541 with SMTP id j6-20020a05600c1c0600b0040c2cc54541mr39738wms.39.1703179207940; Thu, 21 Dec 2023 09:20:07 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c4e8c00b0040d3db8186fsm3023463wmq.5.2023.12.21.09.20.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 04/21] Makefile: clean qemu-iotests output Date: Thu, 21 Dec 2023 18:19:41 +0100 Message-ID: <20231221171958.59350-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- Makefile | 1 + configure | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 676a4a54f48..8f369903356 100644 --- a/Makefile +++ b/Makefile @@ -202,6 +202,7 @@ clean: recurse-clean ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ -exec rm {} + rm -f TAGS cscope.* *~ */*~ + @$(MAKE) -Ctests/qemu-iotests clean VERSION = $(shell cat $(SRC_PATH)/VERSION) diff --git a/configure b/configure index bdda912f362..6ea8f53310e 100755 --- a/configure +++ b/configure @@ -1559,7 +1559,7 @@ LINKS="$LINKS pc-bios/s390-ccw/Makefile" LINKS="$LINKS pc-bios/vof/Makefile" LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit LINKS="$LINKS tests/avocado tests/data" -LINKS="$LINKS tests/qemu-iotests/check" +LINKS="$LINKS tests/qemu-iotests/check tests/qemu-iotests/Makefile" LINKS="$LINKS python" LINKS="$LINKS contrib/plugins/Makefile " for f in $LINKS ; do From patchwork Thu Dec 21 17:19:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879305 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VP9nJvLR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1x0D9Pz1ySd for ; Fri, 22 Dec 2023 04:23:17 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMia-0007YA-5q; Thu, 21 Dec 2023 12:20:20 -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 1rGMiW-0007WV-8k for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiU-0004TM-Md for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=c5AFEUYZiaGJSifWk7hneOWRmCiS1T4SWFJVU19lhvA=; b=VP9nJvLRYqe7Skf/qmqMvj9D1f0OiXAA0hf14v/g4695CyJ+lWRZ1tV5i+rd8uALRr4+Kw RIWpn2uWGEOyDOmbl+wE65benQy69GAQBN3qjOoZwDL1K1T10dvRr/cWEhZQq78efeQVlf +34D1nt+889mfiaWUbhMK/BRX/C4EkA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-64-jY0M5jrQOoS8TctKjfggZA-1; Thu, 21 Dec 2023 12:20:11 -0500 X-MC-Unique: jY0M5jrQOoS8TctKjfggZA-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40c3f0f88e3so7922795e9.0 for ; Thu, 21 Dec 2023 09:20:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179210; x=1703784010; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=c5AFEUYZiaGJSifWk7hneOWRmCiS1T4SWFJVU19lhvA=; b=i95QaZzgMAtQVD8vt7KL8J4eSxLB0B0hKo2Vzb8jj79zw5k2KEJfruLcOEZ7Hhaegz 1L30nSgBDBHAqFXQYqTscy2pQpwWcE8Uwmdin4PMc29JEMyspXay6s7fuHX5NrP4rws1 NT8nSQk1T//gdBP9E9F2ytz/IbsMx7FXrFrQ3LayTn6UlEWma9Qygt9Dn0qGPC83vAim Hh8n4JGEiBh38scseTpZUp6M5uS4TokTjb1L6Pjf3iPr6UnIhS4BI0vGs6njb4QFdFHa RCFJkX9ahiMAzfW7P/Ed1erEwfrrxQmIFVWxSHphDKOXoqpUOa1Nwwdbrd6YvJCa67dp a9+w== X-Gm-Message-State: AOJu0YxX/jKi6NNpBu4VtIZ6OcLRIDoit3jzc2kJu4uuhL9QYgDlBANa qxIgePH40I4UTQVFl9dCcig02QeHtnXH4xO5u82SoD8Ty75fr3yleRpgOy6Fxs7ht6DSza3ObIm alhVW/QppTO58aYL6caT+DvXaGvAalITlDLteDkW4S3e8CR3/zQctEzwZnMG7gB+MW9qO8Zqipy n+1i0cuFQ= X-Received: by 2002:a05:600c:a083:b0:40c:4ef8:a9eb with SMTP id jh3-20020a05600ca08300b0040c4ef8a9ebmr19829wmb.176.1703179210339; Thu, 21 Dec 2023 09:20:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfRsjT+pOYb2E78Zi5b6/1UPsa+viPSqNFC/DYXb6sbBPDTd8d7BURdDbA3DhwuqY2XXsF2Q== X-Received: by 2002:a05:600c:a083:b0:40c:4ef8:a9eb with SMTP id jh3-20020a05600ca08300b0040c4ef8a9ebmr19819wmb.176.1703179209999; Thu, 21 Dec 2023 09:20:09 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id c18-20020a5d4f12000000b00336788c812fsm2455444wru.88.2023.12.21.09.20.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 05/21] configure: remove unnecessary subshell Date: Thu, 21 Dec 2023 18:19:42 +0100 Message-ID: <20231221171958.59350-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Do not use a subshell to hide the shadowing of $config_host_mak. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- configure | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 6ea8f53310e..c634948051b 100755 --- a/configure +++ b/configure @@ -1671,10 +1671,9 @@ if test "$targetos" = windows; then fi # tests/tcg configuration -(config_host_mak=tests/tcg/config-host.mak mkdir -p tests/tcg -echo "# Automatically generated by configure - do not modify" > $config_host_mak -echo "SRC_PATH=$source_path" >> $config_host_mak +echo "# Automatically generated by configure - do not modify" > tests/tcg/$config_host_mak +echo "SRC_PATH=$source_path" >> tests/tcg/$config_host_mak tcg_tests_targets= for target in $target_list; do @@ -1717,9 +1716,8 @@ for target in $target_list; do done if test "$tcg" = "enabled"; then - echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> config-host.mak + echo "TCG_TESTS_TARGETS=$tcg_tests_targets" >> $config_host_mak fi -) if test "$skip_meson" = no; then cross="config-meson.cross.new" From patchwork Thu Dec 21 17:19:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879308 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NA7m0oy1; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy2c5Cggz1ySd for ; Fri, 22 Dec 2023 04:23:52 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMia-0007YT-He; Thu, 21 Dec 2023 12:20:20 -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 1rGMiY-0007Xh-Ux for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiW-0004U5-TA for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UebyFwaouzTqOLbyUOTcfC30JgB1MQMFJW2XtX7hlHw=; b=NA7m0oy1Z+iza1v98aniDz4JRqr5E7gYmjdR/T370B70StlyLzRHxC7I5LGgCn3JcjFtnF zhFYduP+Fx3c/AFwuNhbZP0CsXaa+2ouJGw4sPRTJFfubky6W12/hTEK7Fgieu1yFJYmpp rvnarlQkun7x4PqmDHrBclt59N6MYFM= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-434-8hAs3PC_Meq5JgnN1hcXMA-1; Thu, 21 Dec 2023 12:20:14 -0500 X-MC-Unique: 8hAs3PC_Meq5JgnN1hcXMA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-3368c5eebb4so372797f8f.1 for ; Thu, 21 Dec 2023 09:20:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179213; x=1703784013; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UebyFwaouzTqOLbyUOTcfC30JgB1MQMFJW2XtX7hlHw=; b=A3b1+uNo/46FC5mbCcqpNFWKFChCO9zzbqQlcR74NKKiz69xHTwJe4gFMRFjAU2ptP H39P2tM/DZwHa8WJuYe6SAMouGOmHVsZMVc/t+VRWg6vC6UM+PIgkegMl6z2ZMhvAxB8 qo7XlGeGZF4KdWLuqFu0mdK7tIEHOTdy9d19Xxc1SKijJ5zMit6Ov7fKzs2HBTiDxg4f SA0IcVS2IGNM6b1OZKHJCtY/mOm4WqnQuqtojZWiexPGDbR/vPuZCBeGopWXCBAV/BI8 JXSLE6ICZZCBCOZjBfB4rrSNH/CKua5FrrC+ji0G1mrRtAvZGmtrNtwK8OSJfPJT3wId h+Cw== X-Gm-Message-State: AOJu0YxqdKo78jHB83ZdoY1ucCteHzRtsJ9tzcRMWoZ/z0U8JcY7bYDF WsoHSaOKgQXzUjaPkfbTge/dGUJI33dHuvFS3dhh7v8zcvxnRgeAu8hTe3Enh7v8pJ1lImwTj6I ZYNn7HcJfiaUcjPbKdwPlJG9jwBwyctwWhaezkygXXPeKIty/ZDusQbIw5BjVAB4exy3aETSo7o qmdjn1B9c= X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49479wrt.86.1703179212927; Thu, 21 Dec 2023 09:20:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFxbuR5UguQSGOqNuDsHctwu45FiOcUY838FBTt00QK2tgWZUYxN6H5792VLrPuJgaBU21hCA== X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49471wrt.86.1703179212451; Thu, 21 Dec 2023 09:20:12 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id cx1-20020a056000092100b00336598903e9sm2452334wrb.58.2023.12.21.09.20.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/21] configure: unify again the case arms in probe_target_compiler Date: Thu, 21 Dec 2023 18:19:43 +0100 Message-ID: <20231221171958.59350-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove assignments that match the default, and group the targets for debian-legacy-test-cross and debian-all-test-cross into a single arm. Signed-off-by: Paolo Bonzini --- configure | 86 +++++++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 59 deletions(-) diff --git a/configure b/configure index c634948051b..38ca267096f 100755 --- a/configure +++ b/configure @@ -1272,16 +1272,33 @@ probe_target_compiler() { test "$container" != no || continue test "$host" = "$cpu" || continue case $target_arch in + # debian-all-test-cross architectures + + hppa|m68k|mips|riscv64|sparc64) + container_image=debian-all-test-cross + ;; + mips64) + container_image=debian-all-test-cross + container_cross_prefix=mips64-linux-gnuabi64- + ;; + ppc|ppc64|ppc64le) + container_image=debian-all-test-cross + container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- + ;; + + # debian-legacy-test-cross architectures (need Debian 11) + # - libc6.1-dev-alpha-cross: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1054412 + # - sh4-linux-user: binaries don't run with bookworm compiler + + alpha|sh4) + container_image=debian-legacy-test-cross + ;; + + # architectures with individual containers + aarch64) # We don't have any bigendian build tools so we only use this for AArch64 container_image=debian-arm64-cross - container_cross_prefix=aarch64-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc - ;; - alpha) - container_image=debian-legacy-test-cross - container_cross_prefix=alpha-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc ;; arm) # We don't have any bigendian build tools so we only use this for ARM @@ -1290,18 +1307,11 @@ probe_target_compiler() { ;; cris) container_image=fedora-cris-cross - container_cross_prefix=cris-linux-gnu- ;; hexagon) - container_image=debian-hexagon-cross container_cross_prefix=hexagon-unknown-linux-musl- container_cross_cc=${container_cross_prefix}clang ;; - hppa) - container_image=debian-all-test-cross - container_cross_prefix=hppa-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc - ;; i386) container_image=debian-i686-cross container_cross_prefix=i686-linux-gnu- @@ -1310,59 +1320,19 @@ probe_target_compiler() { container_image=debian-loongarch-cross container_cross_prefix=loongarch64-unknown-linux-gnu- ;; - m68k) - container_image=debian-all-test-cross - container_cross_prefix=m68k-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc - ;; microblaze) - container_image=debian-microblaze-cross container_cross_prefix=microblaze-linux-musl- ;; mips64el) container_image=debian-mips64el-cross container_cross_prefix=mips64el-linux-gnuabi64- ;; - mips64) - container_image=debian-all-test-cross - container_cross_prefix=mips64-linux-gnuabi64- - ;; - mips) - container_image=debian-all-test-cross - container_cross_prefix=mips-linux-gnu- - ;; - nios2) - container_image=debian-nios2-cross - container_cross_prefix=nios2-linux-gnu- - ;; - ppc) - container_image=debian-all-test-cross - container_cross_prefix=powerpc-linux-gnu- - container_cross_cc=${container_cross_prefix}gcc - ;; - ppc64|ppc64le) - container_image=debian-all-test-cross - container_cross_prefix=powerpc${target_arch#ppc}-linux-gnu- - ;; - riscv64) - container_image=debian-all-test-cross - container_cross_prefix=riscv64-linux-gnu- - ;; - sh4) - container_image=debian-legacy-test-cross - container_cross_prefix=sh4-linux-gnu- - ;; - sparc64) - container_image=debian-all-test-cross - container_cross_prefix=sparc64-linux-gnu- - ;; tricore) container_image=debian-tricore-cross container_cross_prefix=tricore- ;; x86_64) container_image=debian-amd64-cross - container_cross_prefix=x86_64-linux-gnu- ;; xtensa*) container_image=debian-xtensa-cross @@ -1370,12 +1340,10 @@ probe_target_compiler() { # default to the dc232b cpu container_cross_prefix=/opt/2020.07/xtensa-dc232b-elf/bin/xtensa-dc232b-elf- ;; - *) - # Debian and GNU architecture names usually match - container_image=debian-$target_arch-cross - container_cross_prefix=$target_arch-linux-gnu- - ;; esac + # Debian and GNU architecture names usually match + : ${container_image:=debian-$target_arch-cross} + : ${container_cross_prefix:=$target_arch-linux-gnu-} : ${container_cross_cc:=${container_cross_prefix}gcc} : ${container_cross_ar:=${container_cross_prefix}ar} : ${container_cross_as:=${container_cross_prefix}as} From patchwork Thu Dec 21 17:19:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879297 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=e9afBHTu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1550fTz1ySd for ; Fri, 22 Dec 2023 04:22:33 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMic-0007ZD-39; Thu, 21 Dec 2023 12:20:22 -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 1rGMia-0007YL-99 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:20 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiY-0004UO-R2 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZU8vC0eIKV9J0hzsPh1002ojqbIAEiiqGuIlBmmkI1A=; b=e9afBHTuQoxKQtB/SwzSJ+8Jnv8r2xcNEkS8NyKQBxdMk+ZrHYG+Tnnzd6K9JWnZ7Dl5q6 5xR9xhknnIcP2PmMK6QpdQ+k6zDOrwGpxOOf7oPOQJkYWr2NIrendIY9WygsDK8pyNROB4 PwUxC4ueXMnDu7jTwZa5duJja5zwccU= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-124-EwY2ohpDMWOM_1bostTNjA-1; Thu, 21 Dec 2023 12:20:16 -0500 X-MC-Unique: EwY2ohpDMWOM_1bostTNjA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33349915d3cso678990f8f.3 for ; Thu, 21 Dec 2023 09:20:16 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179215; x=1703784015; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZU8vC0eIKV9J0hzsPh1002ojqbIAEiiqGuIlBmmkI1A=; b=Rnjg4tzUim4LKJf42FJzpNDcVJKGPVdWFTrXE/XStKDr2v5mDI1vmS9QoDrL/tBMKl 87cZpw+PvIY2Giq9jtY8K4w7p+jvrphpJf+HQ0KgZPLtvcha9NSwh43koS+QkZPfHMY0 /FX/Mjlls6YLvCqQkPzAdDeL9H14aCFqP+kTI4H+SBSEw2PvDGKAwVEXIZ0wIfcIL6xY ly3n9lNnjJa2kENPQkLJpI/hEmFKNq7wB3oJVXKMWG2Tp2qxwrrtSlG/RLfO7+SECXN2 EY3GyEnGbe9N4peQuYS4NluYQKMPPmEYBjkAB4P78dnkEqpZpQ1N0b18z8/KkrO3dU6W fG6w== X-Gm-Message-State: AOJu0YwjIlUWi58gYObx/RRWHpfd6EVQq7VSQVBmBvptiO5dWmkDcbLw 2LmpIq4RAFydeFnNXgMIrtEwaBcVngjZK4G9pBixy0XC8d+r+P1h2R7tTDlD+kaQ/b6pjpQRRg6 AHdOERWWyh+fhtvAC/U0pYTPvPNBWgccngKS1xphkVWMQy/pvl5CSE7j9GVEIkdEpojFPRaIVep QR3oDu5GA= X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49498wrt.86.1703179214826; Thu, 21 Dec 2023 09:20:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IEAr8sCdDSYehFmJVmwpSMyOAYE82EUdmHisRULAfklFUEwLegFKft525NXga73hw3x8WV4Qg== X-Received: by 2002:a5d:6052:0:b0:336:7a45:c134 with SMTP id j18-20020a5d6052000000b003367a45c134mr49494wrt.86.1703179214575; Thu, 21 Dec 2023 09:20:14 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id y17-20020adff151000000b0033664ffaf5dsm2483766wro.37.2023.12.21.09.20.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 07/21] meson: always probe u2f and canokey if the option is enabled Date: Thu, 21 Dec 2023 18:19:44 +0100 Message-ID: <20231221171958.59350-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 6c77d9687de..de33e323d43 100644 --- a/meson.build +++ b/meson.build @@ -1759,12 +1759,12 @@ if not get_option('smartcard').auto() or have_system version: '>=2.5.1', method: 'pkg-config') endif u2f = not_found -if have_system +if not get_option('u2f').auto() or have_system u2f = dependency('u2f-emu', required: get_option('u2f'), method: 'pkg-config') endif canokey = not_found -if have_system +if not get_option('canokey').auto() or have_system canokey = dependency('canokey-qemu', required: get_option('canokey'), method: 'pkg-config') endif From patchwork Thu Dec 21 17:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879299 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=B9T990dw; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy190ZlPz1ySd for ; Fri, 22 Dec 2023 04:22:37 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMif-0007aN-FK; Thu, 21 Dec 2023 12:20:25 -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 1rGMid-0007ZU-27 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:23 -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 1rGMia-0004Uk-U7 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:22 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179220; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=adgA+P49tIryG72UTKIMBjU8hv7uaPLNUb4CmMR+WCw=; b=B9T990dw93JoE971cxRyPD1omeTlEP1Tl6scS9KF/71xi+ac73ieVlM+XVHb68Nj0KiIMW +PNIZOo4x9qxW+Q174ynS6ah17VNLzrHmeNq6CKAcygHoCXj2EKiuj/Tf1g6+ag8RAaPVe 7JDJ4pApLuBiM6CISHNr9jomW2Lxv0w= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-235--mAZMuAQOlyT5xoKAfXSZA-1; Thu, 21 Dec 2023 12:20:18 -0500 X-MC-Unique: -mAZMuAQOlyT5xoKAfXSZA-1 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-33349915d3cso679002f8f.3 for ; Thu, 21 Dec 2023 09:20:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179216; x=1703784016; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=adgA+P49tIryG72UTKIMBjU8hv7uaPLNUb4CmMR+WCw=; b=IMPgMSp/AcYnrRf2K5LwZo3VeKFwjoXSUae+HjFaaAmMRTdqpsiJPNIwj3TYieXtaQ WtkQbEieFQfR4myXfUuqyYeFw2hZFSluTLsIiZIWbP13YoFtaP7n7f+wcJ/cSuBadkis ZcNMNj0E0B08ZWhLuxES24kixpnCV7O/gmT/MgVUz3+lRJanY8S1E0w46fAzIjf3VmZ/ ccLl9lAlYzlYfNAaXjctPGHKNmNzNYRrKOkO2j086fzKuTmpF6GB6qEUsdTy/+ZO/ECd YlZIX6HwO8b3Y9XBTYC/fThqQyglYPTyNc1CvMmLdFazaHyBsUEq2Z4qLX5T0lIPrrW3 T+Sg== X-Gm-Message-State: AOJu0YzVsumgKuKCg+WLzZCVqmEQJuJW5AsFAqn8AeAXZmfpS00W9kF7 TpY5xqpupYZwW2/k2ijaY5nfMWx2ImWecCKbM2CJlpp1gRxaNQHSgyuctYgdmKRd9m2N/vSGEzb GK0VTgZd1iwoCSrJXPdwtC1l22mudSZYZtYqfnDtl3Kz++Y6M/0HjqxDdxtdHHZ5EyTHWhBJf8H 2dmIrvi4I= X-Received: by 2002:a05:600c:538f:b0:40c:2dad:d394 with SMTP id hg15-20020a05600c538f00b0040c2dadd394mr23063wmb.149.1703179216425; Thu, 21 Dec 2023 09:20:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHo5EtQer2d0/XCAUBCLV+53bUQ9YdKdxhJ8jV5z6CWYKtgYtapThAeo6idDwDwghbP6gpZ1Q== X-Received: by 2002:a05:600c:538f:b0:40c:2dad:d394 with SMTP id hg15-20020a05600c538f00b0040c2dadd394mr23055wmb.149.1703179215942; Thu, 21 Dec 2023 09:20:15 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id bi18-20020a05600c3d9200b0040d378623b1sm4006593wmb.22.2023.12.21.09.20.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 08/21] meson: remove OS definitions from config_targetos Date: Thu, 21 Dec 2023 18:19:45 +0100 Message-ID: <20231221171958.59350-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org CONFIG_DARWIN, CONFIG_LINUX and CONFIG_BSD are used in some rules, but only CONFIG_LINUX has substantial use. Convert them all to if...endif. Signed-off-by: Paolo Bonzini --- accel/tcg/meson.build | 4 +++- backends/meson.build | 4 +++- block/meson.build | 4 +++- fsdev/meson.build | 5 +++-- hw/9pfs/meson.build | 7 +++++-- hw/display/meson.build | 7 +++++-- hw/ppc/meson.build | 8 +++++--- hw/usb/meson.build | 4 +++- meson.build | 8 -------- net/can/meson.build | 4 +++- qga/meson.build | 11 +++++------ scsi/meson.build | 8 +++++--- system/meson.build | 4 +++- ui/meson.build | 7 +++---- util/meson.build | 14 ++++++++------ 15 files changed, 57 insertions(+), 42 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 8783edd06ee..1dad6bbbfbd 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -17,7 +17,9 @@ if get_option('plugins') tcg_ss.add(files('plugin-gen.c')) endif tcg_ss.add(when: libdw, if_true: files('debuginfo.c')) -tcg_ss.add(when: 'CONFIG_LINUX', if_true: files('perf.c')) +if targetos == 'linux' + tcg_ss.add(files('perf.c')) +endif specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files( diff --git a/backends/meson.build b/backends/meson.build index 9a5cea480d1..248ce4923c6 100644 --- a/backends/meson.build +++ b/backends/meson.build @@ -12,7 +12,9 @@ system_ss.add([files( system_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c')) system_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c')) -system_ss.add(when: 'CONFIG_LINUX', if_true: files('hostmem-memfd.c')) +if targetos == 'linux' + system_ss.add(files('hostmem-memfd.c')) +endif if keyutils.found() system_ss.add(keyutils, files('cryptodev-lkcf.c')) endif diff --git a/block/meson.build b/block/meson.build index 59ff6d380c0..7faed96c1e7 100644 --- a/block/meson.build +++ b/block/meson.build @@ -91,7 +91,9 @@ endif block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) -block_ss.add(when: 'CONFIG_LINUX', if_true: files('nvme.c')) +if targetos == 'linux' + block_ss.add(files('nvme.c')) +endif if get_option('replication').allowed() block_ss.add(files('replication.c')) endif diff --git a/fsdev/meson.build b/fsdev/meson.build index 1bec0659245..c76347615df 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -6,8 +6,9 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( '9p-marshal.c', 'qemu-fsdev.c', ), if_false: files('qemu-fsdev-dummy.c')) -system_ss.add_all(when: 'CONFIG_LINUX', if_true: fsdev_ss) -system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss) +if targetos in ['linux', 'darwin'] + system_ss.add_all(fsdev_ss) +endif if have_virtfs_proxy_helper executable('virtfs-proxy-helper', diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index 2944ea63c38..3eee7c268a9 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -13,8 +13,11 @@ fs_ss.add(files( 'coth.c', 'coxattr.c', )) -fs_ss.add(when: 'CONFIG_LINUX', if_true: files('9p-util-linux.c')) -fs_ss.add(when: 'CONFIG_DARWIN', if_true: files('9p-util-darwin.c')) +if targetos == 'darwin' + fs_ss.add(files('9p-util-darwin.c')) +elif targetos == 'linux' + fs_ss.add(files('9p-util-linux.c')) +endif fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c')) system_ss.add_all(when: 'CONFIG_FSDEV_9P', if_true: fs_ss) diff --git a/hw/display/meson.build b/hw/display/meson.build index 344dfe3d8c2..02b0044c9ec 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -69,8 +69,11 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss = ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), pixman]) - virtio_gpu_ss.add(when: 'CONFIG_LINUX', if_true: files('virtio-gpu-udmabuf.c'), - if_false: files('virtio-gpu-udmabuf-stubs.c')) + if targetos == 'linux' + virtio_gpu_ss.add(files('virtio-gpu-udmabuf.c')) + else + virtio_gpu_ss.add(files('virtio-gpu-udmabuf-stubs.c')) + endif virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-user-gpu.c')) hw_display_modules += {'virtio-gpu': virtio_gpu_ss} diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index ea44856d43b..3dedcf3043d 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -34,9 +34,11 @@ ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( 'spapr_softmmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) -ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files( - 'spapr_pci_vfio.c', -)) +if targetos == 'linux' + ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( + 'spapr_pci_vfio.c', + )) +endif # IBM PowerNV ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( diff --git a/hw/usb/meson.build b/hw/usb/meson.build index e94149ebdeb..4b44db39cd3 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -58,7 +58,9 @@ endif # U2F system_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c')) -system_ss.add(when: ['CONFIG_LINUX', 'CONFIG_USB_U2F'], if_true: [libudev, files('u2f-passthru.c')]) +if targetos == 'linux' + system_ss.add(when: 'CONFIG_USB_U2F', if_true: [libudev, files('u2f-passthru.c')]) +endif if u2f.found() system_ss.add(when: 'CONFIG_USB_U2F', if_true: [u2f, files('u2f-emulated.c')]) endif diff --git a/meson.build b/meson.build index de33e323d43..ac11adc6c13 100644 --- a/meson.build +++ b/meson.build @@ -2843,14 +2843,6 @@ minikconf = find_program('scripts/minikconf.py') config_targetos = { (targetos == 'windows' ? 'CONFIG_WIN32' : 'CONFIG_POSIX'): 'y' } -if targetos == 'darwin' - config_targetos += {'CONFIG_DARWIN': 'y'} -elif targetos == 'linux' - config_targetos += {'CONFIG_LINUX': 'y'} -endif -if targetos in bsd_oses - config_targetos += {'CONFIG_BSD': 'y'} -endif config_all = {} config_all_devices = {} diff --git a/net/can/meson.build b/net/can/meson.build index 45693c82c9d..bdf6f8eee16 100644 --- a/net/can/meson.build +++ b/net/can/meson.build @@ -1,5 +1,7 @@ can_ss = ss.source_set() can_ss.add(files('can_core.c', 'can_host.c')) -can_ss.add(when: 'CONFIG_LINUX', if_true: files('can_socketcan.c')) +if targetos == 'linux' + can_ss.add(files('can_socketcan.c')) +endif system_ss.add_all(when: 'CONFIG_CAN_BUS', if_true: can_ss) diff --git a/qga/meson.build b/qga/meson.build index a6af614891a..50edaf1c3d4 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -72,12 +72,11 @@ qga_ss.add(when: 'CONFIG_POSIX', if_true: files( 'commands-posix.c', 'commands-posix-ssh.c', )) -qga_ss.add(when: 'CONFIG_LINUX', if_true: files( - 'commands-linux.c', -)) -qga_ss.add(when: 'CONFIG_BSD', if_true: files( - 'commands-bsd.c', -)) +if targetos == 'linux' + qga_ss.add(files('commands-linux.c')) +elif targetos in bsd_oses + qga_ss.add(files('commands-bsd.c')) +endif qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'channel-win32.c', 'commands-win32.c', diff --git a/scsi/meson.build b/scsi/meson.build index 53f3a1f7169..0ff2b3affe0 100644 --- a/scsi/meson.build +++ b/scsi/meson.build @@ -1,4 +1,6 @@ block_ss.add(files('utils.c')) -block_ss.add(when: 'CONFIG_LINUX', - if_true: files('pr-manager.c', 'pr-manager-helper.c'), - if_false: files('pr-manager-stub.c')) +if targetos == 'linux' + block_ss.add(files('pr-manager.c', 'pr-manager-helper.c')) +else + block_ss.add(files('pr-manager-stub.c')) +endif diff --git a/system/meson.build b/system/meson.build index 3a64dd89de1..0632a3daa8a 100644 --- a/system/meson.build +++ b/system/meson.build @@ -33,4 +33,6 @@ endif system_ss.add(when: seccomp, if_true: files('qemu-seccomp.c')) system_ss.add(when: fdt, if_true: files('device_tree.c')) -system_ss.add(when: 'CONFIG_LINUX', if_true: files('async-teardown.c')) +if targetos == 'linux' + system_ss.add('async-teardown.c') +endif diff --git a/ui/meson.build b/ui/meson.build index 0ccb3387ee6..8379a788a1a 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -25,10 +25,9 @@ endif system_ss.add([spice_headers, files('spice-module.c')]) system_ss.add(when: spice_protocol, if_true: files('vdagent.c')) -system_ss.add(when: 'CONFIG_LINUX', if_true: files( - 'input-linux.c', - 'udmabuf.c', -)) +if targetos == 'linux' + system_ss.add(files('input-linux.c', 'udmabuf.c')) +endif system_ss.add(when: cocoa, if_true: files('cocoa.m')) vnc_ss = ss.source_set() diff --git a/util/meson.build b/util/meson.build index 174c133368a..98dd7fa5340 100644 --- a/util/meson.build +++ b/util/meson.build @@ -71,7 +71,9 @@ endif if have_system util_ss.add(files('crc-ccitt.c')) util_ss.add(when: gio, if_true: files('dbus.c')) - util_ss.add(when: 'CONFIG_LINUX', if_true: files('userfaultfd.c')) + if targetos == 'linux' + util_ss.add(files('userfaultfd.c')) + endif endif if have_block or have_ga @@ -92,9 +94,6 @@ if have_block util_ss.add(files('iova-tree.c')) util_ss.add(files('iov.c', 'uri.c')) util_ss.add(files('nvdimm-utils.c')) - util_ss.add(when: 'CONFIG_LINUX', if_true: [ - files('vhost-user-server.c'), vhost_user - ]) util_ss.add(files('block-helpers.c')) util_ss.add(files('qemu-coroutine-sleep.c')) util_ss.add(files('qemu-co-shared-resource.c')) @@ -107,8 +106,11 @@ if have_block else util_ss.add(files('filemonitor-stub.c')) endif - util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c')) - util_ss.add(when: 'CONFIG_LINUX', if_true: files('chardev_open.c')) + if targetos == 'linux' + util_ss.add(files('vhost-user-server.c'), vhost_user) + util_ss.add(files('vfio-helpers.c')) + util_ss.add(files('chardev_open.c')) + endif endif if cpu == 'aarch64' From patchwork Thu Dec 21 17:19:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879295 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=eMB4Blir; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy0N661Kz1yr5 for ; Fri, 22 Dec 2023 04:21:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMie-0007Zs-KB; Thu, 21 Dec 2023 12:20:24 -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 1rGMid-0007Zi-Ve for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:23 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMic-0004Uv-08 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kWX1izeVukWi7Nfv8LDo3lFb0JpfVrIp/K6uYQjHhN0=; b=eMB4BlirkE0pHZ1+Wn7lssVnl4D07W0T4HTffKb/UIRvJjU35vx+utkHfcoEqra/RkHZgi PTGlNww3bP/GcHqZV6P3+Bbu76fWYaR5diUsNeJZ/GKeApu/6A+O56uIo7vcZCHJHHp5Gm Ot1K7FQH1IEMmxmlwmNlFcq6WTc4O/U= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-348-MeJzScT_PPCiFME36pyhWw-1; Thu, 21 Dec 2023 12:20:19 -0500 X-MC-Unique: MeJzScT_PPCiFME36pyhWw-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3368250f2a3so664078f8f.3 for ; Thu, 21 Dec 2023 09:20:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179217; x=1703784017; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kWX1izeVukWi7Nfv8LDo3lFb0JpfVrIp/K6uYQjHhN0=; b=cMif+rOxm8NfaVu/s5a3nlImtYVVpIcR+VcXj2uiNcvTgNFCIN0kjSRtthjxwYliYI vAw6Yg545Oh56x+ofX7ZTxMzDWn/eLXQaWHE9cQRFKIQ3CsDnmfJFYv5PxzAPlAq9j1O RwTUw/v7umUK/tMExod9yHtOUjM9AaFaaa7WsTdspVNOvMY0wpLTNoJhi2rf4VLSsygz eNlaGcBI1ifxoIFn8V6mzta3Ip0akjVCEH4LCSHTObUB2i5sC7p+QRRwmraEWcNaM/Em 4GB8PmsbSFACxNceNO9LqIvIIL5kubjx5dI/ePbuVOykiU1hJNWRTir58VAY9g4rWkW9 VUlA== X-Gm-Message-State: AOJu0Ywx+DpecFSPYWJyBOuyI1lJ5dp58sbJUpHgybHM1WQzBRGXEzma UQVv+dJ8+p0+tUCxmR+f6P4r2RfYFCLKzxNuIBoafPXtwj4hZ55ommwxZzpuQY0mYYT+p6jp+NQ QBE5dIcSd2jwao18pvFe/z8bO8Xy8Bf4/tPEVf5QQrl8TlQpH3BFoTyVZMgQijsSAcipbrTVXps gPPQZ/lOk= X-Received: by 2002:a5d:5692:0:b0:336:71a7:cdf with SMTP id f18-20020a5d5692000000b0033671a70cdfmr28699wrv.229.1703179217548; Thu, 21 Dec 2023 09:20:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IHVVs81izvpIuP/zeHPKruwEBPm76BIR9pXjOqjORH8U8Ert9dY4+xQm4I9tPTVKLS7sUaLnw== X-Received: by 2002:a5d:5692:0:b0:336:71a7:cdf with SMTP id f18-20020a5d5692000000b0033671a70cdfmr28695wrv.229.1703179217075; Thu, 21 Dec 2023 09:20:17 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id c18-20020a5d4f12000000b00336788c812fsm2455678wru.88.2023.12.21.09.20.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 09/21] meson: remove CONFIG_POSIX and CONFIG_WIN32 from config_targetos Date: Thu, 21 Dec 2023 18:19:46 +0100 Message-ID: <20231221171958.59350-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org For consistency with other OSes, use if...endif for rules that are target-independent. Signed-off-by: Paolo Bonzini --- backends/meson.build | 6 ++++-- block/meson.build | 7 +++++-- chardev/meson.build | 26 ++++++++++++++------------ hw/usb/meson.build | 4 +++- meson.build | 11 ++++++----- qga/meson.build | 33 ++++++++++++++++++--------------- ui/meson.build | 8 ++++++-- util/meson.build | 44 +++++++++++++++++++++++--------------------- 8 files changed, 79 insertions(+), 60 deletions(-) diff --git a/backends/meson.build b/backends/meson.build index 248ce4923c6..6dee4e9203b 100644 --- a/backends/meson.build +++ b/backends/meson.build @@ -10,8 +10,10 @@ system_ss.add([files( 'confidential-guest-support.c', ), numa]) -system_ss.add(when: 'CONFIG_POSIX', if_true: files('rng-random.c')) -system_ss.add(when: 'CONFIG_POSIX', if_true: files('hostmem-file.c')) +if targetos != 'windows' + system_ss.add(files('rng-random.c')) + system_ss.add(files('hostmem-file.c')) +endif if targetos == 'linux' system_ss.add(files('hostmem-memfd.c')) endif diff --git a/block/meson.build b/block/meson.build index 7faed96c1e7..ddea1e40070 100644 --- a/block/meson.build +++ b/block/meson.build @@ -88,8 +88,11 @@ if get_option('parallels').allowed() block_ss.add(files('parallels.c', 'parallels-ext.c')) endif -block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-aio.c')) -block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref, iokit]) +if targetos == 'windows' + block_ss.add(files('file-win32.c', 'win32-aio.c')) +else + block_ss.add(files('file-posix.c'), coref, iokit) +endif block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) if targetos == 'linux' block_ss.add(files('nvme.c')) diff --git a/chardev/meson.build b/chardev/meson.build index 6d56ad32fdb..9564ace868b 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -12,20 +12,22 @@ chardev_ss.add(files( 'char-udp.c', 'char.c', )) -chardev_ss.add(when: 'CONFIG_POSIX', if_true: [files( - 'char-fd.c', - 'char-pty.c', -), util]) -if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly'] - chardev_ss.add(files('char-parallel.c')) +if targetos == 'windows' + chardev_ss.add(files( + 'char-console.c', + 'char-win-stdio.c', + 'char-win.c', + )) +else + chardev_ss.add(files( + 'char-fd.c', + 'char-pty.c', + ), util) + if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly'] + chardev_ss.add(files('char-parallel.c')) + endif endif -chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( - 'char-console.c', - 'char-win-stdio.c', - 'char-win.c', -)) - chardev_ss = chardev_ss.apply(config_targetos, strict: false) system_ss.add(files( diff --git a/hw/usb/meson.build b/hw/usb/meson.build index 4b44db39cd3..b7755b638fc 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -44,7 +44,9 @@ system_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c')) system_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c')) system_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c')) system_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c')) -system_ss.add(when: ['CONFIG_POSIX', 'CONFIG_USB_STORAGE_MTP'], if_true: files('dev-mtp.c')) +if targetos != 'windows' + system_ss.add(when: 'CONFIG_USB_STORAGE_MTP', if_true: files('dev-mtp.c')) +endif # smartcard system_ss.add(when: 'CONFIG_USB_SMARTCARD', if_true: files('dev-smartcard-reader.c')) diff --git a/meson.build b/meson.build index ac11adc6c13..0a0c68050e7 100644 --- a/meson.build +++ b/meson.build @@ -2840,9 +2840,7 @@ endif ######################## minikconf = find_program('scripts/minikconf.py') -config_targetos = { - (targetos == 'windows' ? 'CONFIG_WIN32' : 'CONFIG_POSIX'): 'y' -} +config_targetos = {} config_all = {} config_all_devices = {} @@ -3456,8 +3454,11 @@ if have_block # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, # os-win32.c does not - blockdev_ss.add(when: 'CONFIG_POSIX', if_true: files('os-posix.c')) - system_ss.add(when: 'CONFIG_WIN32', if_true: [files('os-win32.c')]) + if targetos == 'windows' + system_ss.add(files('os-win32.c')) + else + blockdev_ss.add(files('os-posix.c')) + endif endif common_ss.add(files('cpu-common.c')) diff --git a/qga/meson.build b/qga/meson.build index 50edaf1c3d4..1113e7c7fae 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -67,22 +67,25 @@ qga_ss.add(files( 'main.c', 'cutils.c', )) -qga_ss.add(when: 'CONFIG_POSIX', if_true: files( - 'channel-posix.c', - 'commands-posix.c', - 'commands-posix-ssh.c', -)) -if targetos == 'linux' - qga_ss.add(files('commands-linux.c')) -elif targetos in bsd_oses - qga_ss.add(files('commands-bsd.c')) +if targetos == 'windows' + qga_ss.add(files( + 'channel-win32.c', + 'commands-win32.c', + 'service-win32.c', + 'vss-win32.c' + )) +else + qga_ss.add(files( + 'channel-posix.c', + 'commands-posix.c', + 'commands-posix-ssh.c', + )) + if targetos == 'linux' + qga_ss.add(files('commands-linux.c')) + elif targetos in bsd_oses + qga_ss.add(files('commands-bsd.c')) + endif endif -qga_ss.add(when: 'CONFIG_WIN32', if_true: files( - 'channel-win32.c', - 'commands-win32.c', - 'service-win32.c', - 'vss-win32.c' -)) qga_ss = qga_ss.apply(config_targetos, strict: false) diff --git a/ui/meson.build b/ui/meson.build index 8379a788a1a..a370494c4ab 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -105,7 +105,9 @@ if dbus_display endif if gtk.found() - system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + if targetos == 'windows' + system_ss.add(files('win32-kbd-hook.c')) + endif gtk_ss = ss.source_set() gtk_ss.add(gtk, vte, pixman, files('gtk.c')) @@ -119,7 +121,9 @@ if gtk.found() endif if sdl.found() - system_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) + if targetos == 'windows' + system_ss.add(files('win32-kbd-hook.c')) + endif sdl_ss = ss.source_set() sdl_ss.add(sdl, sdl_image, pixman, glib, files( diff --git a/util/meson.build b/util/meson.build index 98dd7fa5340..4e970d2b488 100644 --- a/util/meson.build +++ b/util/meson.build @@ -3,28 +3,31 @@ util_ss.add(files('thread-context.c'), numa) if not config_host_data.get('CONFIG_ATOMIC64') util_ss.add(files('atomic64.c')) endif -util_ss.add(when: 'CONFIG_POSIX', if_true: files('aio-posix.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('fdmon-poll.c')) -if config_host_data.get('CONFIG_EPOLL_CREATE1') - util_ss.add(files('fdmon-epoll.c')) +if targetos != 'windows' + util_ss.add(files('aio-posix.c')) + util_ss.add(files('fdmon-poll.c')) + if config_host_data.get('CONFIG_EPOLL_CREATE1') + util_ss.add(files('fdmon-epoll.c')) + endif + util_ss.add(files('compatfd.c')) + util_ss.add(files('event_notifier-posix.c')) + util_ss.add(files('mmap-alloc.c')) + freebsd_dep = [] + if targetos == 'freebsd' + freebsd_dep = util + endif + util_ss.add(files('oslib-posix.c'), freebsd_dep) + util_ss.add(files('qemu-thread-posix.c')) + util_ss.add(files('memfd.c')) + util_ss.add(files('drm.c')) +else + util_ss.add(files('aio-win32.c')) + util_ss.add(files('event_notifier-win32.c')) + util_ss.add(files('oslib-win32.c')) + util_ss.add(files('qemu-thread-win32.c')) + util_ss.add(winmm, pathcch) endif util_ss.add(when: linux_io_uring, if_true: files('fdmon-io_uring.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('compatfd.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('event_notifier-posix.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('mmap-alloc.c')) -freebsd_dep = [] -if targetos == 'freebsd' - freebsd_dep = util -endif -util_ss.add(when: 'CONFIG_POSIX', if_true: [files('oslib-posix.c'), freebsd_dep]) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('qemu-thread-posix.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('memfd.c')) -util_ss.add(when: 'CONFIG_WIN32', if_true: files('aio-win32.c')) -util_ss.add(when: 'CONFIG_WIN32', if_true: files('event_notifier-win32.c')) -util_ss.add(when: 'CONFIG_WIN32', if_true: files('oslib-win32.c')) -util_ss.add(when: 'CONFIG_WIN32', if_true: files('qemu-thread-win32.c')) -util_ss.add(when: 'CONFIG_WIN32', if_true: winmm) -util_ss.add(when: 'CONFIG_WIN32', if_true: pathcch) if glib_has_gslice util_ss.add(files('qtree.c')) endif @@ -56,7 +59,6 @@ util_ss.add(files('reserved-region.c')) util_ss.add(files('stats64.c')) util_ss.add(files('systemd.c')) util_ss.add(files('transactions.c')) -util_ss.add(when: 'CONFIG_POSIX', if_true: files('drm.c')) util_ss.add(files('guest-random.c')) util_ss.add(files('yank.c')) util_ss.add(files('int128.c')) From patchwork Thu Dec 21 17:19:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=IJN4zIxe; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy0N334sz1ySd for ; Fri, 22 Dec 2023 04:21:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMih-0007ac-BR; Thu, 21 Dec 2023 12:20: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 1rGMif-0007aO-EB for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:25 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMid-0004V1-HR for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:25 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gTLf0x62GiI5BxwPBdezIXmvFXtexutkeWtRBMmG4JA=; b=IJN4zIxeNpbyGTa3XDckYNfjBeaewjvVkmZt1YW3qRztrdZ1T11pnNs9G5PyX3vvQEBh8E 2DlfdGb9vGELrFZ6pLNqV0ACVZmdeyXLjVqcezxEfGaN1BVXyE/UaJOSJ5jxOvlRQ4bs/K uUS7/XFDRjFs7O06UR9WSzt8fWUCw6U= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-634-iZ0TaIJMPtOgwaxiEoSUNA-1; Thu, 21 Dec 2023 12:20:21 -0500 X-MC-Unique: iZ0TaIJMPtOgwaxiEoSUNA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3368abe10c5so474613f8f.0 for ; Thu, 21 Dec 2023 09:20:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179219; x=1703784019; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gTLf0x62GiI5BxwPBdezIXmvFXtexutkeWtRBMmG4JA=; b=BgzK33imWZ25QQHK9Sv4RUI7giQLqbdwxyk07EIURQYScAfqYGqc2cM266Aw4LANWS 3tH2nrG4bQ57XnmaOxGmoUSEghytaVCRluDj9d/O8nmm01lqhbm0+lvd/k8GoC+xWkxT T3JaUQ/0i1HU5i4r50jQdMdqKoTWVDEQMRYvuKulAE0PkxUO8JYTE2nmbCgxaPUslh3h K1Aamgqk6UdjRwi7HavLbgAbn4VXbgwZJ6oBmnldpF7YWA2wbBAXC3zbvMSTua4SE/MC rmMKOf25X47gHIaMtmCHpqcGlcghPRHdULYxwGYJY7j9Ev6P436Bm8OK7a3RBfiwn+Wh 9r1Q== X-Gm-Message-State: AOJu0YywL+yhn5BjaMoZTfWxDnGbXIwNOr5LpSmjhtGjp14UTJBgt5kZ 37h5+UJWfyaOGWSq8NpWiefodHA+4DREo/3lV7Fa9siRWgaMtZC0+GSnFyGYdkw2u8ZGODOLbCS VeW6wlPnvEnpZWtDYu09FcuX/7IcbHEvyd0K4l/PzuVpWGe3GBROw/4zC6B+SfyFBt5WGNxydLo WSGmV1T3M= X-Received: by 2002:adf:ed46:0:b0:336:841c:c358 with SMTP id u6-20020adfed46000000b00336841cc358mr42785wro.155.1703179219535; Thu, 21 Dec 2023 09:20:19 -0800 (PST) X-Google-Smtp-Source: AGHT+IHE/LMW6oTzMZc1EnwJMYW/1RsxXDrQE+LEM6s4PDlQ846WtjBU2cKdo3ZW7n2HcFRQ7aJx9g== X-Received: by 2002:adf:ed46:0:b0:336:841c:c358 with SMTP id u6-20020adfed46000000b00336841cc358mr42778wro.155.1703179219138; Thu, 21 Dec 2023 09:20:19 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id e4-20020a5d6d04000000b003367433118bsm2474452wrq.78.2023.12.21.09.20.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:17 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/21] meson: remove config_targetos Date: Thu, 21 Dec 2023 18:19:47 +0100 Message-ID: <20231221171958.59350-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org config_targetos is now empty and can be removed; its use in sourcesets that do not involve target-specific files can be replaced with an empty dictionary. In fact, at this point *all* sourcesets that do not involve target-specific files are just glorified mutable arrays. Enforce that they never test for symbols in "when:" by computing the set of files without "strict: false". Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- chardev/meson.build | 2 +- gdbstub/meson.build | 4 ++-- meson.build | 24 ++++++++++-------------- qga/meson.build | 2 +- storage-daemon/meson.build | 2 +- tcg/meson.build | 2 +- tests/qtest/meson.build | 2 +- 7 files changed, 17 insertions(+), 21 deletions(-) diff --git a/chardev/meson.build b/chardev/meson.build index 9564ace868b..db6840b71af 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -28,7 +28,7 @@ else endif endif -chardev_ss = chardev_ss.apply(config_targetos, strict: false) +chardev_ss = chardev_ss.apply({}) system_ss.add(files( 'char-hmp-cmds.c', diff --git a/gdbstub/meson.build b/gdbstub/meson.build index e5bccba34e5..da5721d8452 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -14,8 +14,8 @@ gdb_system_ss = ss.source_set() gdb_user_ss.add(files('gdbstub.c', 'user.c')) gdb_system_ss.add(files('gdbstub.c', 'system.c')) -gdb_user_ss = gdb_user_ss.apply(config_targetos, strict: false) -gdb_system_ss = gdb_system_ss.apply(config_targetos, strict: false) +gdb_user_ss = gdb_user_ss.apply({}) +gdb_system_ss = gdb_system_ss.apply({}) libgdb_user = static_library('gdb_user', gdb_user_ss.sources() + genh, diff --git a/meson.build b/meson.build index 0a0c68050e7..48d619e0611 100644 --- a/meson.build +++ b/meson.build @@ -2840,7 +2840,6 @@ endif ######################## minikconf = find_program('scripts/minikconf.py') -config_targetos = {} config_all = {} config_all_devices = {} @@ -3039,7 +3038,6 @@ target_dirs = actual_target_dirs # pseudo symbol replaces it. config_all += config_all_devices -config_all += config_targetos config_all += config_all_disas config_all += { 'CONFIG_XEN': xen.found(), @@ -3389,7 +3387,7 @@ if enable_modules modulecommon = declare_dependency(link_whole: libmodulecommon, compile_args: '-DBUILD_DSO') endif -qom_ss = qom_ss.apply(config_targetos, strict: false) +qom_ss = qom_ss.apply({}) libqom = static_library('qom', qom_ss.sources() + genh, dependencies: [qom_ss.dependencies()], name_suffix: 'fa', @@ -3404,10 +3402,10 @@ event_loop_base = static_library('event-loop-base', event_loop_base = declare_dependency(link_whole: event_loop_base, dependencies: [qom]) -stub_ss = stub_ss.apply(config_all, strict: false) +stub_ss = stub_ss.apply({}) util_ss.add_all(trace_ss) -util_ss = util_ss.apply(config_all, strict: false) +util_ss = util_ss.apply({}) libqemuutil = static_library('qemuutil', build_by_default: false, sources: util_ss.sources() + stub_ss.sources() + genh, @@ -3570,7 +3568,6 @@ foreach d, list : target_modules foreach target : target_dirs if target.endswith('-softmmu') config_target = config_target_mak[target] - config_target += config_targetos target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] c_args = ['-DNEED_CPU_H', '-DCONFIG_TARGET="@0@-config-target.h"'.format(target), @@ -3631,7 +3628,7 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', capture: true, command: [undefsym, nm, '@INPUT@']) -authz_ss = authz_ss.apply(config_targetos, strict: false) +authz_ss = authz_ss.apply({}) libauthz = static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], name_suffix: 'fa', @@ -3640,7 +3637,7 @@ libauthz = static_library('authz', authz_ss.sources() + genh, authz = declare_dependency(link_whole: libauthz, dependencies: qom) -crypto_ss = crypto_ss.apply(config_targetos, strict: false) +crypto_ss = crypto_ss.apply({}) libcrypto = static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], name_suffix: 'fa', @@ -3649,7 +3646,7 @@ libcrypto = static_library('crypto', crypto_ss.sources() + genh, crypto = declare_dependency(link_whole: libcrypto, dependencies: [authz, qom]) -io_ss = io_ss.apply(config_targetos, strict: false) +io_ss = io_ss.apply({}) libio = static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], link_with: libqemuutil, @@ -3665,7 +3662,7 @@ migration = declare_dependency(link_with: libmigration, dependencies: [zlib, qom, io]) system_ss.add(migration) -block_ss = block_ss.apply(config_targetos, strict: false) +block_ss = block_ss.apply({}) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), link_depends: block_syms, @@ -3676,7 +3673,7 @@ block = declare_dependency(link_whole: [libblock], link_args: '@block.syms', dependencies: [crypto, io]) -blockdev_ss = blockdev_ss.apply(config_targetos, strict: false) +blockdev_ss = blockdev_ss.apply({}) libblockdev = static_library('blockdev', blockdev_ss.sources() + genh, dependencies: blockdev_ss.dependencies(), name_suffix: 'fa', @@ -3685,7 +3682,7 @@ libblockdev = static_library('blockdev', blockdev_ss.sources() + genh, blockdev = declare_dependency(link_whole: [libblockdev], dependencies: [block, event_loop_base]) -qmp_ss = qmp_ss.apply(config_targetos, strict: false) +qmp_ss = qmp_ss.apply({}) libqmp = static_library('qmp', qmp_ss.sources() + genh, dependencies: qmp_ss.dependencies(), name_suffix: 'fa', @@ -3700,7 +3697,7 @@ libchardev = static_library('chardev', chardev_ss.sources() + genh, chardev = declare_dependency(link_whole: libchardev) -hwcore_ss = hwcore_ss.apply(config_targetos, strict: false) +hwcore_ss = hwcore_ss.apply({}) libhwcore = static_library('hwcore', sources: hwcore_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) @@ -3757,7 +3754,6 @@ foreach target : target_dirs '-DCONFIG_DEVICES="@0@-config-devices.h"'.format(target)] link_args = emulator_link_args - config_target += config_targetos target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] if targetos == 'linux' target_inc += include_directories('linux-headers', is_system: true) diff --git a/qga/meson.build b/qga/meson.build index 1113e7c7fae..66c0f1e56f8 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -87,7 +87,7 @@ else endif endif -qga_ss = qga_ss.apply(config_targetos, strict: false) +qga_ss = qga_ss.apply({}) gen_tlb = [] qga_libs = [] diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 5e90cd32b40..46267b63e72 100644 --- a/storage-daemon/meson.build +++ b/storage-daemon/meson.build @@ -5,7 +5,7 @@ qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls) subdir('qapi') if have_tools - qsd_ss = qsd_ss.apply(config_targetos, strict: false) + qsd_ss = qsd_ss.apply({}) qsd = executable('qemu-storage-daemon', qsd_ss.sources(), dependencies: qsd_ss.dependencies(), diff --git a/tcg/meson.build b/tcg/meson.build index 895a11d3fa2..5afdec1e1ae 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -22,7 +22,7 @@ if get_option('tcg_interpreter') tcg_ss.add(files('tci.c')) endif -tcg_ss = tcg_ss.apply(config_targetos, strict: false) +tcg_ss = tcg_ss.apply({}) libtcg_user = static_library('tcg_user', tcg_ss.sources() + genh, diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 47dabf91d04..40a8bb043e4 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -310,7 +310,7 @@ qtests = { 'ivshmem-test': [rt, '../../contrib/ivshmem-server/ivshmem-server.c'], 'migration-test': migration_files, 'pxe-test': files('boot-sector.c'), - 'qos-test': [chardev, io, qos_test_ss.apply(config_targetos, strict: false).sources()], + 'qos-test': [chardev, io, qos_test_ss.apply({}).sources()], 'tpm-crb-swtpm-test': [io, tpmemu_files], 'tpm-crb-test': [io, tpmemu_files], 'tpm-tis-swtpm-test': [io, tpmemu_files, 'tpm-tis-util.c'], From patchwork Thu Dec 21 17:19:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879298 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=cArRNGgR; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy170cwLz1ySd for ; Fri, 22 Dec 2023 04:22:35 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMij-0007bM-OR; Thu, 21 Dec 2023 12:20:29 -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 1rGMii-0007ax-Ob for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:28 -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 1rGMig-0004Vb-DF for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:28 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hv5JlMMu+kt6QWVUatqaPVLHyGybXwKvJleBgwjh6E0=; b=cArRNGgROsoLunlARuNM1X+vrHZ1inemfK+WVtPvkMb3xJ+I7EH28wIY9zlHwNSifvAMr2 bn9Mk4qNstLiycdkVBHV7qCBmauBpztzPY5a0ScLCSZ54cpdV04vqSBQI2xN+6Z2zZFSHy lXzKTBGu9o8p0pbjPQECXm5EJE8j7hY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-385-cL-DjsxIO2qQbOGi002-ZQ-1; Thu, 21 Dec 2023 12:20:23 -0500 X-MC-Unique: cL-DjsxIO2qQbOGi002-ZQ-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40d3eabab1eso5759855e9.2 for ; Thu, 21 Dec 2023 09:20:23 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179222; x=1703784022; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hv5JlMMu+kt6QWVUatqaPVLHyGybXwKvJleBgwjh6E0=; b=OChsZ618LybvNsBNiHH7ysq/GYufkRLeg9fPmGO/5JfoMb4m5Ymb9q8HMm2QTcZHNj TLNCQWACgThVlNLh2E9n0VXEgCIBfbAhRjUJO9mJhgH8zkT/DTO8zkfJI5OMs+2vG92R CociGqnxq90XYZBEnTuQXFLNlR8Zc/KmEy+ZIw+AZmaoy1Qd88eWh7RuG26pkxV+9HGD oJUUzMcmebB/XRhJMxyP0UhF1QpcLfXYeT82M2cIenpWAPwvtgbpq0MUHfnF/bRz2M7B CRIwoCzYpJsP6Dba8XpNz9g8nwOrIK8X+kDIeVhblbrAoDtvlxt9iLbH6okF5ZdnTi8b P5Kg== X-Gm-Message-State: AOJu0Yy/tRrzXhdQu7qDcbzIKUl4XH4uUOBSIZkBGVplyH3MmpUVRAX7 Ita+V5ix+i1jT1Wot/7uuX9ujk4W/C5ihZUcRFqsgaRe6c8yZ0KWrJoNDK3s3HVfuBUbGfysxR+ wrXZLM2HXgK5MdASxzHPybEkXbImjaN1+ql1LdejPjb8omWCnWFpzqPqLZ/0+2AaowBcildLIrZ l4q1TveCg= X-Received: by 2002:a05:600c:4f56:b0:40c:69dc:18ac with SMTP id m22-20020a05600c4f5600b0040c69dc18acmr41702wmq.59.1703179221654; Thu, 21 Dec 2023 09:20:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IEiJrU/8amStlbHPKIySQfVpITIPNAVCT9o6ACnpahWp045cQJTqqO8nPvdlZQxEi17mCBOxQ== X-Received: by 2002:a05:600c:4f56:b0:40c:69dc:18ac with SMTP id m22-20020a05600c4f5600b0040c69dc18acmr41695wmq.59.1703179221190; Thu, 21 Dec 2023 09:20:21 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id g3-20020a05600c310300b0040c6b2c8fa9sm11862842wmo.41.2023.12.21.09.20.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/21] meson: remove CONFIG_ALL Date: Thu, 21 Dec 2023 18:19:48 +0100 Message-ID: <20231221171958.59350-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org CONFIG_ALL is tricky to use and was ported over to Meson from the recursive processing of Makefile variables. Meson sourcesets however have all_sources() and all_dependencies() methods that remove the need for it. Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 15 --------------- fsdev/meson.build | 1 - hw/acpi/meson.build | 5 ----- hw/cxl/meson.build | 2 -- hw/display/meson.build | 1 - hw/mem/meson.build | 1 - hw/net/meson.build | 2 -- hw/pci-bridge/meson.build | 2 -- hw/pci/meson.build | 1 - hw/remote/meson.build | 1 - hw/smbios/meson.build | 5 ----- hw/virtio/meson.build | 2 -- meson.build | 32 +++++++------------------------- net/meson.build | 2 -- 14 files changed, 7 insertions(+), 65 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 43d6005881e..09caf2f8e19 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -256,21 +256,6 @@ Target-independent emulator sourcesets: ``system_ss`` only in system emulators, ``user_ss`` only in user-mode emulators. - Target-independent sourcesets must exercise particular care when using - ``if_false`` rules. The ``if_false`` rule will be used correctly when linking - emulator binaries; however, when *compiling* target-independent files - into .o files, Meson may need to pick *both* the ``if_true`` and - ``if_false`` sides to cater for targets that want either side. To - achieve that, you can add a special rule using the ``CONFIG_ALL`` - symbol:: - - # Some targets have CONFIG_ACPI, some don't, so this is not enough - system_ss.add(when: 'CONFIG_ACPI', if_true: files('acpi.c'), - if_false: files('acpi-stub.c')) - - # This is required as well: - system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c')) - Target-dependent emulator sourcesets: In the target-dependent set lives CPU emulation, some device emulation and much glue code. This sometimes also has to be compiled multiple times, diff --git a/fsdev/meson.build b/fsdev/meson.build index c76347615df..db67530d7f2 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -1,6 +1,5 @@ fsdev_ss = ss.source_set() fsdev_ss.add(files('qemu-fsdev-opts.c', 'qemu-fsdev-throttle.c')) -fsdev_ss.add(when: 'CONFIG_ALL', if_true: files('qemu-fsdev-dummy.c')) fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( '9p-iov-marshal.c', '9p-marshal.c', diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build index fc1b952379a..5441c9b1e4c 100644 --- a/hw/acpi/meson.build +++ b/hw/acpi/meson.build @@ -33,9 +33,4 @@ endif system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c')) system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c')) system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss) -system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-stub.c', 'aml-build-stub.c', - 'acpi-x86-stub.c', 'ipmi-stub.c', 'ghes-stub.c', - 'acpi-mem-hotplug-stub.c', 'acpi-cpu-hotplug-stub.c', - 'acpi-pci-hotplug-stub.c', 'acpi-nvdimm-stub.c', - 'cxl-stub.c', 'pci-bridge-stub.c')) system_ss.add(files('acpi-qmp-cmds.c')) diff --git a/hw/cxl/meson.build b/hw/cxl/meson.build index ea0aebf6e3c..3e375f61a98 100644 --- a/hw/cxl/meson.build +++ b/hw/cxl/meson.build @@ -11,5 +11,3 @@ system_ss.add(when: 'CONFIG_CXL', if_false: files( 'cxl-host-stubs.c', )) - -system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl-host-stubs.c')) diff --git a/hw/display/meson.build b/hw/display/meson.build index 02b0044c9ec..ac0159c516e 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -143,5 +143,4 @@ endif system_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c')) modules += { 'hw-display': hw_display_modules } diff --git a/hw/mem/meson.build b/hw/mem/meson.build index ec26ef55443..faee1fe9360 100644 --- a/hw/mem/meson.build +++ b/hw/mem/meson.build @@ -5,7 +5,6 @@ mem_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx_mc.c')) mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c')) mem_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_true: files('cxl_type3.c')) system_ss.add(when: 'CONFIG_CXL_MEM_DEVICE', if_false: files('cxl_type3_stubs.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('cxl_type3_stubs.c')) system_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss) diff --git a/hw/net/meson.build b/hw/net/meson.build index f64651c467e..9afceb06191 100644 --- a/hw/net/meson.build +++ b/hw/net/meson.build @@ -50,7 +50,6 @@ specific_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('virtio-net.c')) if have_vhost_net system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost_net.c'), if_false: files('vhost_net-stub.c')) - system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost_net-stub.c')) else system_ss.add(files('vhost_net-stub.c')) endif @@ -69,7 +68,6 @@ system_ss.add(when: 'CONFIG_ROCKER', if_true: files( 'rocker/rocker_of_dpa.c', 'rocker/rocker_world.c', ), if_false: files('rocker/qmp-norocker.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('rocker/qmp-norocker.c')) system_ss.add(files('rocker/rocker-hmp-cmds.c')) subdir('can') diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build index 6d5ad9f37b2..f2a60434dda 100644 --- a/hw/pci-bridge/meson.build +++ b/hw/pci-bridge/meson.build @@ -13,5 +13,3 @@ pci_ss.add(when: 'CONFIG_CXL', if_true: files('cxl_root_port.c', 'cxl_upstream.c pci_ss.add(when: 'CONFIG_SIMBA', if_true: files('simba.c')) system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) - -system_ss.add(when: 'CONFIG_ALL', if_true: files('pci_expander_bridge_stubs.c')) diff --git a/hw/pci/meson.build b/hw/pci/meson.build index b1855452f5b..b9c34b2acfe 100644 --- a/hw/pci/meson.build +++ b/hw/pci/meson.build @@ -20,4 +20,3 @@ system_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_ho system_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss) system_ss.add(when: 'CONFIG_PCI', if_false: files('pci-stub.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('pci-stub.c')) diff --git a/hw/remote/meson.build b/hw/remote/meson.build index a3aa29aaf17..41eb4971d98 100644 --- a/hw/remote/meson.build +++ b/hw/remote/meson.build @@ -11,7 +11,6 @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iommu.c')) remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: libvfio_user_dep) remote_ss.add(when: 'CONFIG_VFIO_USER_SERVER', if_true: files('vfio-user-obj.c'), if_false: files('vfio-user-obj-stub.c')) -remote_ss.add(when: 'CONFIG_ALL', if_true: files('vfio-user-obj-stub.c')) specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c')) specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c')) diff --git a/hw/smbios/meson.build b/hw/smbios/meson.build index 6eeae4b35c2..70469674621 100644 --- a/hw/smbios/meson.build +++ b/hw/smbios/meson.build @@ -6,8 +6,3 @@ smbios_ss.add(when: 'CONFIG_IPMI', system_ss.add_all(when: 'CONFIG_SMBIOS', if_true: smbios_ss) system_ss.add(when: 'CONFIG_SMBIOS', if_false: files('smbios-stub.c')) - -system_ss.add(when: 'CONFIG_ALL', if_true: files( - 'smbios-stub.c', - 'smbios_type_38-stub.c', -)) diff --git a/hw/virtio/meson.build b/hw/virtio/meson.build index c0055a78326..c8c1001451d 100644 --- a/hw/virtio/meson.build +++ b/hw/virtio/meson.build @@ -74,8 +74,6 @@ specific_virtio_ss.add_all(when: 'CONFIG_VIRTIO_PCI', if_true: virtio_pci_ss) system_ss.add_all(when: 'CONFIG_VIRTIO', if_true: system_virtio_ss) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('vhost-stub.c')) system_ss.add(when: 'CONFIG_VIRTIO', if_false: files('virtio-stub.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-stub.c')) -system_ss.add(when: 'CONFIG_ALL', if_true: files('virtio-stub.c')) system_ss.add(files('virtio-hmp-cmds.c')) specific_ss.add_all(when: 'CONFIG_VIRTIO', if_true: specific_virtio_ss) diff --git a/meson.build b/meson.build index 48d619e0611..49cc1886bb2 100644 --- a/meson.build +++ b/meson.build @@ -2843,7 +2843,6 @@ minikconf = find_program('scripts/minikconf.py') config_all = {} config_all_devices = {} -config_all_disas = {} config_devices_mak_list = [] config_devices_h = {} config_target_h = {} @@ -2969,7 +2968,6 @@ foreach target : target_dirs if host_arch.startswith(k) or config_target['TARGET_BASE_ARCH'].startswith(k) foreach sym: v config_target += { sym: 'y' } - config_all_disas += { sym: 'y' } endforeach endif endforeach @@ -3028,24 +3026,6 @@ foreach target : target_dirs endforeach target_dirs = actual_target_dirs -# This configuration is used to build files that are shared by -# multiple binaries, and then extracted out of the "common" -# static_library target. -# -# We do not use all_sources()/all_dependencies(), because it would -# build literally all source files, including devices only used by -# targets that are not built for this compilation. The CONFIG_ALL -# pseudo symbol replaces it. - -config_all += config_all_devices -config_all += config_all_disas -config_all += { - 'CONFIG_XEN': xen.found(), - 'CONFIG_SYSTEM_ONLY': have_system, - 'CONFIG_USER_ONLY': have_user, - 'CONFIG_ALL': true, -} - target_configs_h = [] foreach target: target_dirs target_configs_h += config_target_h[target] @@ -3532,7 +3512,7 @@ foreach d, list : modules foreach m, module_ss : list if enable_modules - module_ss = module_ss.apply(config_all, strict: false) + module_ss = module_ss.apply(config_all_devices, strict: false) sl = static_library(d + '-' + m, [genh, module_ss.sources()], dependencies: [modulecommon, module_ss.dependencies()], pic: true) if d == 'block' @@ -3727,13 +3707,15 @@ common_ss.add(qom, qemuutil) common_ss.add_all(when: 'CONFIG_SYSTEM_ONLY', if_true: [system_ss]) common_ss.add_all(when: 'CONFIG_USER_ONLY', if_true: user_ss) -common_all = common_ss.apply(config_all, strict: false) +# Note that this library is never used directly (only through extract_objects) +# and is not built by default; therefore, source files not used by the build +# configuration will be in build.ninja, but are never built by default. common_all = static_library('common', build_by_default: false, - sources: common_all.sources() + genh, + sources: common_ss.all_sources() + genh, include_directories: common_user_inc, implicit_include_directories: false, - dependencies: common_all.dependencies(), + dependencies: common_ss.all_dependencies(), name_suffix: 'fa') feature_to_c = find_program('scripts/feature_to_c.py') @@ -4206,7 +4188,7 @@ if have_system if xen.found() summary_info += {'xen ctrl version': xen.version()} endif - summary_info += {'Xen emulation': config_all.has_key('CONFIG_XEN_EMU')} + summary_info += {'Xen emulation': config_all_devices.has_key('CONFIG_XEN_EMU')} endif summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')} if config_all.has_key('CONFIG_TCG') diff --git a/net/meson.build b/net/meson.build index ce99bd4447f..a53f18ad7b4 100644 --- a/net/meson.build +++ b/net/meson.build @@ -41,7 +41,6 @@ system_ss.add(when: libxdp, if_true: files('af-xdp.c')) if have_vhost_net_user system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c')) - system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c')) endif if targetos == 'windows' @@ -57,7 +56,6 @@ else endif if have_vhost_net_vdpa system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'), if_false: files('vhost-vdpa-stub.c')) - system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c')) endif vmnet_files = files( From patchwork Thu Dec 21 17:19:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879304 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Fbl32hMU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1t6VdHz1yr5 for ; Fri, 22 Dec 2023 04:23:14 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMil-0007bd-4d; Thu, 21 Dec 2023 12:20:31 -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 1rGMij-0007bI-Km for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:29 -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 1rGMih-0004X4-Sn for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179226; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ZGe578TNuximFmLhEvGbqzpnfBIm+qVcI5gcFSmVLn0=; b=Fbl32hMUUgYSId+Fq9aqufxAVveFzmwKqHnd0hXbop+iy8jhVNLhutcCKdqBHE3kKzenod JhHtnEi47+KDEH7T1j3tZ269RnvsacaTk4jaheY/TRN8c27C6hGHGrZudrK/AO+wVq7CT3 QlPNaLCIa5OlgV+/d3gOf2gKdGaX5Xg= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-191-P_WgTcplOmaC0jOPoS5TzA-1; Thu, 21 Dec 2023 12:20:24 -0500 X-MC-Unique: P_WgTcplOmaC0jOPoS5TzA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-33667220256so703706f8f.3 for ; Thu, 21 Dec 2023 09:20:24 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179223; x=1703784023; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZGe578TNuximFmLhEvGbqzpnfBIm+qVcI5gcFSmVLn0=; b=gqhVOXWTe4kDujY8O1mFvr4KUGMRi8mUoOPsThgpkR5QPPBTakwyrSLEpT462XytvX pFuTpwm36NL4fCaBzo3seWuVxQJ9Ic1RPAQx62MpphPfTcjJ8CIM503RfrH30DUIkw6c DZGosZqzve+LdZgCTspg458HVxmoUqWXQb8IT0Qvt4xJaeXGk6LK0r36S9GRCWTtpgJN A1JkjBzC7WUB/YbAXa/8VQ2QMEi5mqrPVWVZb9TinhiipcjvIGTgTrGtAnwcb1mdkh7H VjmT0VB4Nllj213U12hJ+mp424yi3E0p+Rwd7mcgA9YR+UBfw2J2jTOF7U9wnHN0Yn1A eg2A== X-Gm-Message-State: AOJu0YwgrGHKXHaoDN8/jIrWn39QoeQgbRDzWLB2BRpS0JW74IlzT5EN afCf0HcGlVrk5tV99H5sXZCpW3oV/jSJ55+PVcQ08WCBqB2Iv3S5H07EkHH9EHNladebXznhbz0 4smZDT/bEtLcV5crWgvIduUgnIysfAMrXn2Yi5K67uYip6NNr37FJM3F+Z+uZHtnBZFSmu52iSk tuH5TuYSM= X-Received: by 2002:a05:600c:1553:b0:40b:5e1f:6fd8 with SMTP id f19-20020a05600c155300b0040b5e1f6fd8mr39202wmg.45.1703179222784; Thu, 21 Dec 2023 09:20:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IHxEjF51LORulsyckx6HyovBrnB0fV3hTdtNbAVMzS6BQrPyBm/fArLdIwa/vPb5+UqSwlJXg== X-Received: by 2002:a05:600c:1553:b0:40b:5e1f:6fd8 with SMTP id f19-20020a05600c155300b0040b5e1f6fd8mr39197wmg.45.1703179222367; Thu, 21 Dec 2023 09:20:22 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id f12-20020a05600c154c00b0040d18ffbeeasm4063274wmg.31.2023.12.21.09.20.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:21 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 12/21] meson: rename config_all Date: Thu, 21 Dec 2023 18:19:49 +0100 Message-ID: <20231221171958.59350-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org config_all now lists only accelerators, rename it to indicate its actual content. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- hw/mips/meson.build | 2 +- meson.build | 16 ++++++++-------- target/arm/meson.build | 2 +- target/mips/meson.build | 2 +- tests/fp/meson.build | 2 +- tests/meson.build | 2 +- tests/qtest/meson.build | 8 ++++---- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/hw/mips/meson.build b/hw/mips/meson.build index 900613fc087..f06d88f3430 100644 --- a/hw/mips/meson.build +++ b/hw/mips/meson.build @@ -5,7 +5,7 @@ mips_ss.add(when: 'CONFIG_LOONGSON3V', if_true: files('loongson3_bootp.c', 'loon mips_ss.add(when: 'CONFIG_MALTA', if_true: files('malta.c')) mips_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('cps.c')) -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel mips_ss.add(when: 'CONFIG_JAZZ', if_true: files('jazz.c')) mips_ss.add(when: 'CONFIG_MIPSSIM', if_true: files('mipssim.c')) mips_ss.add(when: 'CONFIG_FULOONG', if_true: files('fuloong2e.c')) diff --git a/meson.build b/meson.build index 49cc1886bb2..b5a85c4c255 100644 --- a/meson.build +++ b/meson.build @@ -2841,7 +2841,7 @@ endif minikconf = find_program('scripts/minikconf.py') -config_all = {} +config_all_accel = {} config_all_devices = {} config_devices_mak_list = [] config_devices_h = {} @@ -2929,7 +2929,7 @@ foreach target : target_dirs foreach sym: accelerators if sym == 'CONFIG_TCG' or target in accelerator_targets.get(sym, []) config_target += { sym: 'y' } - config_all += { sym: 'y' } + config_all_accel += { sym: 'y' } if target in modular_tcg config_target += { 'CONFIG_TCG_MODULAR': 'y' } else @@ -4180,18 +4180,18 @@ endif # Targets and accelerators summary_info = {} if have_system - summary_info += {'KVM support': config_all.has_key('CONFIG_KVM')} - summary_info += {'HVF support': config_all.has_key('CONFIG_HVF')} - summary_info += {'WHPX support': config_all.has_key('CONFIG_WHPX')} - summary_info += {'NVMM support': config_all.has_key('CONFIG_NVMM')} + summary_info += {'KVM support': config_all_accel.has_key('CONFIG_KVM')} + summary_info += {'HVF support': config_all_accel.has_key('CONFIG_HVF')} + summary_info += {'WHPX support': config_all_accel.has_key('CONFIG_WHPX')} + summary_info += {'NVMM support': config_all_accel.has_key('CONFIG_NVMM')} summary_info += {'Xen support': xen.found()} if xen.found() summary_info += {'xen ctrl version': xen.version()} endif summary_info += {'Xen emulation': config_all_devices.has_key('CONFIG_XEN_EMU')} endif -summary_info += {'TCG support': config_all.has_key('CONFIG_TCG')} -if config_all.has_key('CONFIG_TCG') +summary_info += {'TCG support': config_all_accel.has_key('CONFIG_TCG')} +if config_all_accel.has_key('CONFIG_TCG') if get_option('tcg_interpreter') summary_info += {'TCG backend': 'TCI (TCG with bytecode interpreter, slow)'} else diff --git a/target/arm/meson.build b/target/arm/meson.build index d6c3902e676..46b5a21eb31 100644 --- a/target/arm/meson.build +++ b/target/arm/meson.build @@ -28,7 +28,7 @@ arm_system_ss.add(files( subdir('hvf') -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('tcg') else arm_ss.add(files('tcg-stubs.c')) diff --git a/target/mips/meson.build b/target/mips/meson.build index e57ef24ecf4..a26d1e1f792 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -12,7 +12,7 @@ if have_system subdir('sysemu') endif -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('tcg') endif diff --git a/tests/fp/meson.build b/tests/fp/meson.build index cbc17392d67..9ef322afc42 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -1,4 +1,4 @@ -if 'CONFIG_TCG' not in config_all +if 'CONFIG_TCG' not in config_all_accel subdir_done() endif # There are namespace pollution issues on Windows, due to osdep.h diff --git a/tests/meson.build b/tests/meson.build index 9996a293fbb..32cc15a3ef7 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -76,7 +76,7 @@ endif subdir('decode') -if 'CONFIG_TCG' in config_all +if 'CONFIG_TCG' in config_all_accel subdir('fp') endif diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 40a8bb043e4..565eff4c0a2 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -155,8 +155,8 @@ qtests_ppc = \ qtests_filter + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \ - (config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ - (config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \ + (config_all_accel.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + \ + (config_all_accel.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + \ ['boot-order-test'] qtests_ppc64 = \ @@ -213,12 +213,12 @@ qtests_arm = \ # TODO: once aarch64 TCG is fixed on ARM 32 bit host, make bios-tables-test unconditional qtests_aarch64 = \ (cpu != 'arm' and unpack_edk2_blobs ? ['bios-tables-test'] : []) + \ - (config_all.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ + (config_all_accel.has_key('CONFIG_TCG') and config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? \ ['tpm-tis-device-test', 'tpm-tis-device-swtpm-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \ (config_all_devices.has_key('CONFIG_XLNX_VERSAL') ? ['xlnx-canfd-test', 'xlnx-versal-trng-test'] : []) + \ (config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \ - (config_all.has_key('CONFIG_TCG') and \ + (config_all_accel.has_key('CONFIG_TCG') and \ config_all_devices.has_key('CONFIG_TPM_TIS_I2C') ? ['tpm-tis-i2c-test'] : []) + \ ['arm-cpu-features', 'numa-test', From patchwork Thu Dec 21 17:19:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=NxBCKLcW; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1m4bPsz1ySd for ; Fri, 22 Dec 2023 04:23:08 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMil-0007be-Do; Thu, 21 Dec 2023 12:20:31 -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 1rGMik-0007bV-I9 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMii-0004XQ-W6 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bXT4Dl0Kw/7UM64Z5onnUqN5IYVBTfeIAuQM9EaJTPg=; b=NxBCKLcWFS3twH9X9Qd2wkRkPBQg3WpteoKxBwGp+kZ9fQ5JnKdWxa3fEebYT/GajUc68h Oo8B54+Jnf2VyajdxTRC0J87QO0CTREIEMIJF9OArep2/rfefQ0QdCHx5Vm2d3OoOiZtN2 C9abYDC7PeQ/mlAEf8AjVLz0+PHlHc0= 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-690-roYk5VeqNaal9V_83knv0Q-1; Thu, 21 Dec 2023 12:20:26 -0500 X-MC-Unique: roYk5VeqNaal9V_83knv0Q-1 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-40c348e529fso8939135e9.2 for ; Thu, 21 Dec 2023 09:20:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179224; x=1703784024; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bXT4Dl0Kw/7UM64Z5onnUqN5IYVBTfeIAuQM9EaJTPg=; b=Rd/Zk1taE3AYHgpXyFME2o39nQg86DO2B3ma1MpA90nD+x0biMhi9+c7XUe6nc9S+k FwsuY7Ax+4ukMhFBYELB1m10ik2oqF8xGss0cVedP8ZR6a/tcsXz+Q5thkypvBs8x6/Q /mM6CX6WdvjjZai6zv8gqCmiz03btUrdlLftI8U8SQlHnnyRqhSixGVD6YgowLjoR9Ni RySjQheXD45BOHq9PHDHtAM5kEozQpt2dhJiuZ8788pdbD5UmVUpWka9Wv8iMee0X17w OkYunwc+mT+T+UVPuiBj2YjgIgN+2PkrRCpfAkz0NP0003bMRJzFljo+h4oelHmiiCBZ oFcw== X-Gm-Message-State: AOJu0YxRnhvrGyb1dGYg7LiRBevWyuydB7CdKW+VYL0ClYPMDIE4BhPB U1xmk/1sUufTFRsQIlr9yfMffWEY76H+oKfoh0+IuSIbinx4p9aWa9rX9qzgnqgzKiCg4Y58YZg 9+uj0CCKqkSncs7LVoQW2SmnAeBbNuBK/ZKUgaJhHSrYio8PNuUNnQuPgXszwzY5uyFWrP3fa6e k+rK8jQ80= X-Received: by 2002:a05:600c:40c:b0:40c:3417:233 with SMTP id q12-20020a05600c040c00b0040c34170233mr42208wmb.102.1703179224699; Thu, 21 Dec 2023 09:20:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyljcVcXNeb+ld2T9i+/82DeC4yFp094jkIGHpaIIQvrjpJlWGHKt41mH9p76sgh2v+2YUfQ== X-Received: by 2002:a05:600c:40c:b0:40c:3417:233 with SMTP id q12-20020a05600c040c00b0040c34170233mr42205wmb.102.1703179224331; Thu, 21 Dec 2023 09:20:24 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id u4-20020a05600c138400b0040c03c3289bsm4025229wmf.37.2023.12.21.09.20.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/21] meson: add more sections to main meson.build Date: Thu, 21 Dec 2023 18:19:50 +0100 Message-ID: <20231221171958.59350-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index b5a85c4c255..b8c64c5ecf7 100644 --- a/meson.build +++ b/meson.build @@ -9,6 +9,10 @@ add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough']) meson.add_postconf_script(find_program('scripts/symlink-install-tree.py')) +#################### +# Global variables # +#################### + not_found = dependency('', required: false) keyval = import('keyval') ss = import('sourceset') @@ -86,8 +90,16 @@ enable_modules = get_option('modules') \ .allowed() have_block = have_system or have_tools +############ +# Programs # +############ + python = import('python').find_installation() +####################################### +# Variables for host and accelerators # +####################################### + if cpu not in supported_cpus host_arch = 'unknown' elif cpu == 'x86' @@ -518,9 +530,9 @@ if sparse.found() '-Wno-non-pointer-null']) endif -########################################### -# Target-specific checks and dependencies # -########################################### +##################### +# Option validation # +##################### # Fuzzing if get_option('fuzzing') and get_option('fuzzing_engine') == '' and \ @@ -3495,9 +3507,9 @@ specific_ss.add_all(when: 'CONFIG_TCG_BUILTIN', if_true: tcg_module_ss) target_modules += { 'accel' : { 'qtest': qtest_module_ss, 'tcg': tcg_real_module_ss }} -######################## -# Library dependencies # -######################## +############################################## +# Internal static_libraries and dependencies # +############################################## modinfo_collect = find_program('scripts/modinfo-collect.py') modinfo_generate = find_program('scripts/modinfo-generate.py') From patchwork Thu Dec 21 17:19:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879292 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=O4d4wput; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy0G34Qbz1ySd for ; Fri, 22 Dec 2023 04:21:50 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMin-0007cH-8h; Thu, 21 Dec 2023 12:20:33 -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 1rGMim-0007bu-IV for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:32 -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 1rGMik-0004Y4-Tn for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:32 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cuDZZGfujoEkwBEeQaDmvaxMxn2etEI2ao+6xKMwJak=; b=O4d4wputKQu8yM93vqBSMDvLRLrlJEKhmeA6FjtwnHdW2k8s08MOU7jCgoemSklc9C5faE uZ0sxIc3yFvVm4Gg3jpcDkyj6I7rHT8SCbeUG62TJ8745EvdLMqMZnIlCMFBzgEk9ykIgV B5CTyseoP+iHituuTs1e8lGqbEBZx1I= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-455-XUlRsx2OOtKmpVfs6z6OMA-1; Thu, 21 Dec 2023 12:20:28 -0500 X-MC-Unique: XUlRsx2OOtKmpVfs6z6OMA-1 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3368c707b03so381060f8f.3 for ; Thu, 21 Dec 2023 09:20:28 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179227; x=1703784027; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cuDZZGfujoEkwBEeQaDmvaxMxn2etEI2ao+6xKMwJak=; b=NdA6NmxMjXCmZqjXYDGzPBFb27NDF/nbXFZdPmO7tQVwnuJpr92smeQUUZXWWsaE31 LX03gTq2x826jWIe7bv4dqvzTeZy24EDKDUXG+f3SUJ0NWTA27QWLBdQabe9vXfBWqyl KwL/uac/9lAB/WwdmMegSo8FZIlcIPAj9f2tvr104VjbqxUF+6+iFRyJksPAgvTzgZYt XkGqBuJTmXOaSkdXnsmbTotl6RCDuQbSGDtbQrkFPPjwUoX4cqgyJomnyDDoqk+vc+Ob JW5Qu91lfNlyTEXQ4SHVfGspEk8j7id8jl6LrPBe4YI+ytjKghr+Hb4L/GH6YtIbQ6fE c8EQ== X-Gm-Message-State: AOJu0YyLvw1PvdBoU1WGB/UxeUK5NCYIQkYc4xCabh785HZrtsPXNiAx Dt+1JkI+YV9+FHhF4wJ2yTIacl37UtmWccFyAcf7W5fJ2y/nQAckQTNxUwFWyC6qY02eWuFp+9U 5FpMzG19maBiMfBjbXftOlGu3iKfILL0uotSGGhAYcKwuuhka+RD/VBXaB5RS61GnrCDj6xY/tb NTNL3drAQ= X-Received: by 2002:a5d:4491:0:b0:336:9ec:683 with SMTP id j17-20020a5d4491000000b0033609ec0683mr71259wrq.24.1703179226887; Thu, 21 Dec 2023 09:20:26 -0800 (PST) X-Google-Smtp-Source: AGHT+IHx2FLl27pL9WfZsCUrfXND3ftVdOSTZiYNeUNKRi9IvgN+kv3Uhzre0pI19KT3eeU51YyiNA== X-Received: by 2002:a5d:4491:0:b0:336:9ec:683 with SMTP id j17-20020a5d4491000000b0033609ec0683mr71252wrq.24.1703179226469; Thu, 21 Dec 2023 09:20:26 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id y17-20020adff151000000b0033664ffaf5dsm2484120wro.37.2023.12.21.09.20.24 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:25 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/21] meson: move program checks together Date: Thu, 21 Dec 2023 18:19:51 +0100 Message-ID: <20231221171958.59350-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 90 ++++++++++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/meson.build b/meson.build index b8c64c5ecf7..1a1e006ba13 100644 --- a/meson.build +++ b/meson.build @@ -19,21 +19,8 @@ ss = import('sourceset') fs = import('fs') targetos = host_machine.system() -sh = find_program('sh') config_host = keyval.load(meson.current_build_dir() / 'config-host.mak') -cc = meson.get_compiler('c') -all_languages = ['c'] -if targetos == 'windows' and add_languages('cpp', required: false, native: false) - all_languages += ['cpp'] - cxx = meson.get_compiler('cpp') -endif -if targetos == 'darwin' and \ - add_languages('objc', required: get_option('cocoa'), native: false) - all_languages += ['objc'] - objc = meson.get_compiler('objc') -endif - # Temporary directory used for files created while # configure runs. Since it is in the build directory # we can safely blow away any previous version of it @@ -94,8 +81,53 @@ have_block = have_system or have_tools # Programs # ############ +sh = find_program('sh') python = import('python').find_installation() +cc = meson.get_compiler('c') +all_languages = ['c'] +if targetos == 'windows' and add_languages('cpp', required: false, native: false) + all_languages += ['cpp'] + cxx = meson.get_compiler('cpp') +endif +if targetos == 'darwin' and \ + add_languages('objc', required: get_option('cocoa'), native: false) + all_languages += ['objc'] + objc = meson.get_compiler('objc') +endif + +dtrace = not_found +stap = not_found +if 'dtrace' in get_option('trace_backends') + dtrace = find_program('dtrace', required: true) + stap = find_program('stap', required: false) + if stap.found() + # Workaround to avoid dtrace(1) producing a file with 'hidden' symbol + # visibility. Define STAP_SDT_V2 to produce 'default' symbol visibility + # instead. QEMU --enable-modules depends on this because the SystemTap + # semaphores are linked into the main binary and not the module's shared + # object. + add_global_arguments('-DSTAP_SDT_V2', + native: false, language: all_languages) + endif +endif + +if get_option('iasl') == '' + iasl = find_program('iasl', required: false) +else + iasl = find_program(get_option('iasl'), required: true) +endif + +edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] +unpack_edk2_blobs = false +foreach target : edk2_targets + if target in target_dirs + bzip2 = find_program('bzip2', required: get_option('install_blobs')) + unpack_edk2_blobs = bzip2.found() + break + endif +endforeach + ####################################### # Variables for host and accelerators # ####################################### @@ -167,38 +199,6 @@ if targetos != 'darwin' modular_tcg = ['i386-softmmu', 'x86_64-softmmu'] endif -edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ] -unpack_edk2_blobs = false -foreach target : edk2_targets - if target in target_dirs - bzip2 = find_program('bzip2', required: get_option('install_blobs')) - unpack_edk2_blobs = bzip2.found() - break - endif -endforeach - -dtrace = not_found -stap = not_found -if 'dtrace' in get_option('trace_backends') - dtrace = find_program('dtrace', required: true) - stap = find_program('stap', required: false) - if stap.found() - # Workaround to avoid dtrace(1) producing a file with 'hidden' symbol - # visibility. Define STAP_SDT_V2 to produce 'default' symbol visibility - # instead. QEMU --enable-modules depends on this because the SystemTap - # semaphores are linked into the main binary and not the module's shared - # object. - add_global_arguments('-DSTAP_SDT_V2', - native: false, language: all_languages) - endif -endif - -if get_option('iasl') == '' - iasl = find_program('iasl', required: false) -else - iasl = find_program(get_option('iasl'), required: true) -endif - ################## # Compiler flags # ################## From patchwork Thu Dec 21 17:19:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879302 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=LYXlHYRS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1T69Tkz1ySd for ; Fri, 22 Dec 2023 04:22:53 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMip-0007cr-Pc; Thu, 21 Dec 2023 12:20:35 -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 1rGMio-0007cU-2X for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMim-0004YL-Jc for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:33 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179232; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=aC+zFBXfg2XfUMrGRAwKHIKbBC2VYBZ5admwocdXPY8=; b=LYXlHYRSrABFmYRbiFG2XlMBMj0rQUTebAFrYJX6qd7MvFEQHodh2TDN993ccYs0tP4PCg +A/7e1cBp0V9hDmmS6NKDeCtJs9mLzmJah+BfJJtNQSgKt+C/u1MA2y2nOf7JflCQRBOyt 51rin6k5hqT0L4HJqccbEkzLK926UVk= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-600-Cws0quYCO6G0aoH4SCM5uA-1; Thu, 21 Dec 2023 12:20:30 -0500 X-MC-Unique: Cws0quYCO6G0aoH4SCM5uA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c4297e070so7313645e9.3 for ; Thu, 21 Dec 2023 09:20:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179229; x=1703784029; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aC+zFBXfg2XfUMrGRAwKHIKbBC2VYBZ5admwocdXPY8=; b=gVJ28hkdsU60Wzh2AEDxoBxBw9VfmNyj3z3/k8tmo9jM+Pn9C+tTsb70zT61OilIWT cevdF+6jnHV9oqzqFNKkxuBYnWA7HmHjwxXznNasodVe/QxP20m44CeZwRve1PFQnOEd G7ppOyMR2JHAtx9u/bVXUsOlLNXv7CEmTMEVVUgl1Chrx3O0ebTqJmABin/ow7EUbAyQ SsakfecAR4OCV9kWeWp4+IdPf/onBDL3dg79y3rsYUXmzdn7FfMDTGsQeoWE/oVnzEbT R5X3UtlUBvv5GomLFbMgpvgIYnhNYYvtMF/6epq5B5bD7cgRRGJTzzd5xR2TmvhHIWTr +1Xg== X-Gm-Message-State: AOJu0YwBYYI09uiDrRfjBAgXgWRJbC/lb4658haDhYDw6ukmUlygWB5I oILmcf5MPsMoUYwepKrBROTvF5o3RottZS7kEDPPpBWEYMar+f5+Zb37OU5wyo+EhwgSDnH1L3I EB9sGnaRFGUvGmeOUklVj2a8TRavUiy0Mjaee5zk0Cjzh6sar/LyBqSwQS8Fnj/gKpWATqgvOEp +1viPjREo= X-Received: by 2002:a05:600c:4f41:b0:40c:32f2:a302 with SMTP id m1-20020a05600c4f4100b0040c32f2a302mr25285wmq.94.1703179228965; Thu, 21 Dec 2023 09:20:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlZO6QrfiDWLpFRvV7NnBDz2RfpWCdV83LW/JrEFpfh7Z8PY6aYlN+kkaBtH8EzVrD54dsMg== X-Received: by 2002:a05:600c:4f41:b0:40c:32f2:a302 with SMTP id m1-20020a05600c4f4100b0040c32f2a302mr25280wmq.94.1703179228645; Thu, 21 Dec 2023 09:20:28 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id bh20-20020a05600c3d1400b0040d15dcb77asm11834336wmb.23.2023.12.21.09.20.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/21] meson: move option validation a bit closer Date: Thu, 21 Dec 2023 18:19:52 +0100 Message-ID: <20231221171958.59350-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Not entirely possible for option that depend on compiler or dependency checks, but it's a start. Signed-off-by: Paolo Bonzini --- meson.build | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/meson.build b/meson.build index 1a1e006ba13..f7e7deeabdc 100644 --- a/meson.build +++ b/meson.build @@ -52,30 +52,6 @@ supported_cpus = ['ppc', 'ppc64', 's390x', 'riscv32', 'riscv64', 'x86', 'x86_64' cpu = host_machine.cpu_family() target_dirs = config_host['TARGET_DIRS'].split() -have_linux_user = false -have_bsd_user = false -have_system = false -foreach target : target_dirs - have_linux_user = have_linux_user or target.endswith('linux-user') - have_bsd_user = have_bsd_user or target.endswith('bsd-user') - have_system = have_system or target.endswith('-softmmu') -endforeach -have_user = have_linux_user or have_bsd_user -have_tools = get_option('tools') \ - .disable_auto_if(not have_system) \ - .allowed() -have_ga = get_option('guest_agent') \ - .disable_auto_if(not have_system and not have_tools) \ - .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd', 'openbsd'], - error_message: 'unsupported OS for QEMU guest agent') \ - .allowed() -enable_modules = get_option('modules') \ - .require(targetos != 'windows', - error_message: 'Modules are not available for Windows') \ - .require(not get_option('prefer_static'), - error_message: 'Modules are incompatible with static linking') \ - .allowed() -have_block = have_system or have_tools ############ # Programs # @@ -576,6 +552,34 @@ have_tpm = get_option('tpm') \ .require(targetos != 'windows', error_message: 'TPM emulation only available on POSIX systems') \ .allowed() +# type of binaries to build +have_linux_user = false +have_bsd_user = false +have_system = false +foreach target : target_dirs + have_linux_user = have_linux_user or target.endswith('linux-user') + have_bsd_user = have_bsd_user or target.endswith('bsd-user') + have_system = have_system or target.endswith('-softmmu') +endforeach +have_user = have_linux_user or have_bsd_user + +have_tools = get_option('tools') \ + .disable_auto_if(not have_system) \ + .allowed() +have_ga = get_option('guest_agent') \ + .disable_auto_if(not have_system and not have_tools) \ + .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd', 'openbsd'], + error_message: 'unsupported OS for QEMU guest agent') \ + .allowed() + +have_block = have_system or have_tools +enable_modules = get_option('modules') \ + .require(targetos != 'windows', + error_message: 'Modules are not available for Windows') \ + .require(not get_option('prefer_static'), + error_message: 'Modules are incompatible with static linking') \ + .allowed() + # vhost have_vhost_user = get_option('vhost_user') \ .disable_auto_if(targetos != 'linux') \ From patchwork Thu Dec 21 17:19:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879307 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=deOFytHk; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy2b210gz1ySd for ; Fri, 22 Dec 2023 04:23:51 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMit-0007dZ-AL; Thu, 21 Dec 2023 12:20:39 -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 1rGMir-0007d7-0N for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:37 -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 1rGMip-0004Yr-Ap for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:36 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sD8zQ2qb3Nom9XRhoC85XFShfiOQE1gFLBrQwUhPrTc=; b=deOFytHk+VR+CF1epwZTuSxVEfllgufWtUoTyBuLvooQcQarpxTrzjrwz3J5keOfMvzrxf /vyHLvxUPBva0+x4yRfRKJkBX5+tgX4hs3cQ21RAfT2LeYYTlJ4/45E/64kijIu9Q2NAyX ikroUGSizl25Z11+9nbPVqo6zelcg9Q= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-241-MLLCW4BGNt2Z9rfWW3WFag-1; Thu, 21 Dec 2023 12:20:32 -0500 X-MC-Unique: MLLCW4BGNt2Z9rfWW3WFag-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3368abe10c5so474720f8f.0 for ; Thu, 21 Dec 2023 09:20:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179231; x=1703784031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sD8zQ2qb3Nom9XRhoC85XFShfiOQE1gFLBrQwUhPrTc=; b=QYa6//vyGvhrmSDQOD+XhVSVxDmMzYyJdEXTXt+bBbvQy2BCKCJRH4HO6GJEoIsHzb TX4z9hzU/JKYBnEdyPtcOd6r0YaU+jYwmtW2A3U3Fq6GHfipUpmJJ9XBTbcgvZGjR2Vn rEAFHlXTSFA3qsTfHLDMy7SXzsiFyPWTqJiOTaWBMDeRKG0FeJpjeo1TadxJseKPYY1k dLl9i51voZim0I7snsu+6EjH9kX0UdKreot+8ro6JypGBEzVgmhmIMaWdPC+cfq9zY6W YDHN+IF4bsmtSaL+RC1FOTgI3mVTFjqzfZIqlKIEj/vsJ4yPYnB1VoGBomgc53j284lZ x3mw== X-Gm-Message-State: AOJu0YydnShmvPVXDakoiCsqVC2QmE6CyBgA6Qij4+eQpI6JDKEOceA8 f1BDfsGqQe9z08wrdkKXpCo2lKNSVLAuUrxg9eIYxk9esKHEeikqHnOzCbjVx02Xk8D14uN8VPy CXx2l/CnW6pMLgg9KV8y1qNcEMz37iuXcvh/sDoYF0jtcVj2KDKabzi/4zE15p7VWWUXry+eKY+ z1yPlQT6k= X-Received: by 2002:a5d:5089:0:b0:336:6e12:7c5f with SMTP id a9-20020a5d5089000000b003366e127c5fmr56559wrt.2.1703179230887; Thu, 21 Dec 2023 09:20:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IEwaQTjWh2xejvEFLV8qW4v3JJem4Pa5RUPQ/sN3+qn05rPuSiPC8rYUeGw4fOvBWV9a4P+zA== X-Received: by 2002:a5d:5089:0:b0:336:6e12:7c5f with SMTP id a9-20020a5d5089000000b003366e127c5fmr56555wrt.2.1703179230518; Thu, 21 Dec 2023 09:20:30 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id w11-20020adfcd0b000000b003367e35abd4sm2463078wrm.71.2023.12.21.09.20.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:29 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 16/21] meson: separate host-specific checks from option validation Date: Thu, 21 Dec 2023 18:19:53 +0100 Message-ID: <20231221171958.59350-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 97 +++++++++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/meson.build b/meson.build index f7e7deeabdc..e777f507ce3 100644 --- a/meson.build +++ b/meson.build @@ -602,53 +602,6 @@ have_vhost_net_vdpa = have_vhost_vdpa and get_option('vhost_net').allowed() have_vhost_net_kernel = have_vhost_kernel and get_option('vhost_net').allowed() have_vhost_net = have_vhost_net_kernel or have_vhost_net_user or have_vhost_net_vdpa -# Target-specific libraries and flags -libm = cc.find_library('m', required: false) -threads = dependency('threads') -util = cc.find_library('util', required: false) -winmm = [] -socket = [] -version_res = [] -coref = [] -iokit = [] -emulator_link_args = [] -nvmm =not_found -hvf = not_found -midl = not_found -widl = not_found -pathcch = not_found -host_dsosuf = '.so' -if targetos == 'windows' - midl = find_program('midl', required: false) - widl = find_program('widl', required: false) - pathcch = cc.find_library('pathcch') - socket = cc.find_library('ws2_32') - winmm = cc.find_library('winmm') - - win = import('windows') - version_res = win.compile_resources('version.rc', - depend_files: files('pc-bios/qemu-nsis.ico'), - include_directories: include_directories('.')) - host_dsosuf = '.dll' -elif targetos == 'darwin' - coref = dependency('appleframeworks', modules: 'CoreFoundation') - iokit = dependency('appleframeworks', modules: 'IOKit', required: false) - host_dsosuf = '.dylib' -elif targetos == 'sunos' - socket = [cc.find_library('socket'), - cc.find_library('nsl'), - cc.find_library('resolv')] -elif targetos == 'haiku' - socket = [cc.find_library('posix_error_mapper'), - cc.find_library('network'), - cc.find_library('bsd')] -elif targetos == 'openbsd' - if get_option('tcg').allowed() and target_dirs.length() > 0 - # Disable OpenBSD W^X if available - emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded') - endif -endif - # Target-specific configuration of accelerators accelerators = [] if get_option('kvm').allowed() and targetos == 'linux' @@ -716,6 +669,56 @@ if 'CONFIG_WHPX' not in accelerators and get_option('whpx').enabled() error('WHPX not available on this platform') endif +##################################### +# Host-specific libraries and flags # +##################################### + +libm = cc.find_library('m', required: false) +threads = dependency('threads') +util = cc.find_library('util', required: false) +winmm = [] +socket = [] +version_res = [] +coref = [] +iokit = [] +emulator_link_args = [] +nvmm =not_found +hvf = not_found +midl = not_found +widl = not_found +pathcch = not_found +host_dsosuf = '.so' +if targetos == 'windows' + midl = find_program('midl', required: false) + widl = find_program('widl', required: false) + pathcch = cc.find_library('pathcch') + socket = cc.find_library('ws2_32') + winmm = cc.find_library('winmm') + + win = import('windows') + version_res = win.compile_resources('version.rc', + depend_files: files('pc-bios/qemu-nsis.ico'), + include_directories: include_directories('.')) + host_dsosuf = '.dll' +elif targetos == 'darwin' + coref = dependency('appleframeworks', modules: 'CoreFoundation') + iokit = dependency('appleframeworks', modules: 'IOKit', required: false) + host_dsosuf = '.dylib' +elif targetos == 'sunos' + socket = [cc.find_library('socket'), + cc.find_library('nsl'), + cc.find_library('resolv')] +elif targetos == 'haiku' + socket = [cc.find_library('posix_error_mapper'), + cc.find_library('network'), + cc.find_library('bsd')] +elif targetos == 'openbsd' + if get_option('tcg').allowed() and target_dirs.length() > 0 + # Disable OpenBSD W^X if available + emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded') + endif +endif + ################ # Dependencies # ################ From patchwork Thu Dec 21 17:19:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=BJmDaFtH; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy0T5Ny2z1ySd for ; Fri, 22 Dec 2023 04:22:01 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMiu-0007dm-76; Thu, 21 Dec 2023 12:20:40 -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 1rGMis-0007dI-9W for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:38 -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 1rGMiq-0004Z1-KJ for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XGKSDQRWT3Y8gs5FUjlvUHuPqorGos1W4QnqrsXKm88=; b=BJmDaFtHkfpFBXVOLC4PFnqI7OA2P/1K823y2pV6uCXUpBz5z8yYSp5oyxNcvW+Pwbpa5U jm2P0Omm/35kNNf2Tlm+7F4OpyrNJH5PhsMSpkFHuKfWd9kLAusqwajFTeZagV0/fVJIv9 3DAPHF9PNy88r5UZgbN8Q4fykcPcDss= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-97-sz5ScC4tPBqQhVAOkPEb8g-1; Thu, 21 Dec 2023 12:20:34 -0500 X-MC-Unique: sz5ScC4tPBqQhVAOkPEb8g-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40c22bc1ebdso4794175e9.1 for ; Thu, 21 Dec 2023 09:20:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179233; x=1703784033; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XGKSDQRWT3Y8gs5FUjlvUHuPqorGos1W4QnqrsXKm88=; b=hb3mqtW9dBiJYADu/fAHOx9zPBFfxnUI4G8c9THwsTAUIe9TS3EdZbiPm5lv+BSYTu 4FmBIVJi2d3JC4UoBzX/bDx1uIjc+JznddsMBTPUzIOrLRoNUZuSvEvONXjyCantWehS GkYCaWifVEvhl1d9dVbbeSigTf7AuLLkvu31HE6KmXT1mxKEFcu4mkCiBeYgC2D74o4Z R41m38ruy9ACeUcoAMCOO4+7fjdWHUiA7a8JJUMo2pzsN4sgBtmye6xc+iGGoMkLVykt WhPv/X/b5VZRg99vNf/1H0RNZ3aIwGM9KdViWkIFnSwm3DzxEewaXHHOnG+4UGsV/180 xVag== X-Gm-Message-State: AOJu0YwTwDZMxzv8NwfsxBHmDOlN/wln6MQsAmWCn+zBTulzE2eKu+lv HAz5X75oB/vFvYsX2h+iIN67ZkAi/9CznJG1m8hUsYL/J05m9pcD3WVvGCnJmZDM0tk1jKFQx/w 1VDCvhsHaWS/pjSsw03EWbFFROpGOdnJJSEdmDyykUbUTwzGorbRZWwnRjrhOiKtBqqPD2bvV8X bINRzO3OY= X-Received: by 2002:a05:600c:3b19:b0:40c:415f:cc48 with SMTP id m25-20020a05600c3b1900b0040c415fcc48mr16435wms.40.1703179232943; Thu, 21 Dec 2023 09:20:32 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnEaYotkAQyqBg+1vK4BYOWCZrglsMyQD0BrE+8s45hKJVZruaAA8vSH/yufNtaDqphmOVoQ== X-Received: by 2002:a05:600c:3b19:b0:40c:415f:cc48 with SMTP id m25-20020a05600c3b1900b0040c415fcc48mr16424wms.40.1703179232616; Thu, 21 Dec 2023 09:20:32 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id o20-20020a05600c4fd400b004094d4292aesm4014821wmq.18.2023.12.21.09.20.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:31 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 17/21] meson: keep subprojects together Date: Thu, 21 Dec 2023 18:19:54 +0100 Message-ID: <20231221171958.59350-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org And move away dependencies that are not subprojects anymore. Signed-off-by: Paolo Bonzini --- meson.build | 72 ++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/meson.build b/meson.build index e777f507ce3..f8d61a46ad1 100644 --- a/meson.build +++ b/meson.build @@ -1538,6 +1538,25 @@ if not gnutls_crypto.found() endif endif +capstone = not_found +if not get_option('capstone').auto() or have_system or have_user + capstone = dependency('capstone', version: '>=3.0.5', + method: 'pkg-config', + required: get_option('capstone')) + + # Some versions of capstone have broken pkg-config file + # that reports a wrong -I path, causing the #include to + # fail later. If the system has such a broken version + # do not use it. + if capstone.found() and not cc.compiles('#include ', + dependencies: [capstone]) + capstone = not_found + if get_option('capstone').enabled() + error('capstone requested, but it does not appear to work') + endif + endif +endif + gmp = dependency('gmp', required: false, method: 'pkg-config') if nettle.found() and gmp.found() hogweed = dependency('hogweed', version: '>=3.4', @@ -2123,6 +2142,7 @@ config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_whitelist_in_tools')) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) config_host_data.set('CONFIG_BSD', targetos in bsd_oses) +config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_DARWIN', targetos == 'darwin') config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) @@ -2186,6 +2206,7 @@ if seccomp.found() config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc) endif config_host_data.set('CONFIG_PIXMAN', pixman.found()) +config_host_data.set('CONFIG_SLIRP', slirp.found()) config_host_data.set('CONFIG_SNAPPY', snappy.found()) config_host_data.set('CONFIG_SOLARIS', targetos == 'sunos') if get_option('tcg').allowed() @@ -3057,28 +3078,9 @@ genh += custom_target('config-poison.h', command: [find_program('scripts/make-config-poison.sh'), target_configs_h]) -############## -# Submodules # -############## - -capstone = not_found -if not get_option('capstone').auto() or have_system or have_user - capstone = dependency('capstone', version: '>=3.0.5', - method: 'pkg-config', - required: get_option('capstone')) - - # Some versions of capstone have broken pkg-config file - # that reports a wrong -I path, causing the #include to - # fail later. If the system has such a broken version - # do not use it. - if capstone.found() and not cc.compiles('#include ', - dependencies: [capstone]) - capstone = not_found - if get_option('capstone').enabled() - error('capstone requested, but it does not appear to work') - endif - endif -endif +############### +# Subprojects # +############### libvfio_user_dep = not_found if have_system and vfio_user_server_allowed @@ -3122,9 +3124,19 @@ else fdt_opt = 'disabled' endif -config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_FDT', fdt.found()) -config_host_data.set('CONFIG_SLIRP', slirp.found()) + +vhost_user = not_found +if targetos == 'linux' and have_vhost_user + libvhost_user = subproject('libvhost-user') + vhost_user = libvhost_user.get_variable('vhost_user_dep') +endif + +libvduse = not_found +if have_libvduse + libvduse_proj = subproject('libvduse') + libvduse = libvduse_proj.get_variable('libvduse_dep') +endif ##################### # Generated sources # @@ -3355,18 +3367,6 @@ if have_system or have_user ] endif -vhost_user = not_found -if targetos == 'linux' and have_vhost_user - libvhost_user = subproject('libvhost-user') - vhost_user = libvhost_user.get_variable('vhost_user_dep') -endif - -libvduse = not_found -if have_libvduse - libvduse_proj = subproject('libvduse') - libvduse = libvduse_proj.get_variable('libvduse_dep') -endif - # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. subdir('qapi') From patchwork Thu Dec 21 17:19:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879290 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Q0wQtdCz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SwxzX0J8sz1ySd for ; Fri, 22 Dec 2023 04:21:12 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMj0-0007kD-U1; Thu, 21 Dec 2023 12:20:46 -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 1rGMix-0007jP-MW for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:43 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiv-0004Zd-TY for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7e+XdxKgUWz7O6d5Snj7fR5TolQnFsQ/3r43x69TnoM=; b=Q0wQtdCzfq6tiidcLGL5XGruXk4VdR746oVVIivUyw5EtdIuT6yhU6YGH9mam8BaCIV5MR +CdClkjETcS5XI0/0x4YzY7gw2XkwhNsTo6hyzLgxt0f5lLtU3LrkphqGiaOS9iWGZdDsD k7bGGfj2YrSywtQV2GGpSOxCddC6vvo= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-472-s-2N5g_GPJGTV-VhwBuF3w-1; Thu, 21 Dec 2023 12:20:36 -0500 X-MC-Unique: s-2N5g_GPJGTV-VhwBuF3w-1 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-336890da9b7so539285f8f.0 for ; Thu, 21 Dec 2023 09:20:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179235; x=1703784035; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7e+XdxKgUWz7O6d5Snj7fR5TolQnFsQ/3r43x69TnoM=; b=XRrGCFMKcMApYwBLgR5yxJiyQcf73CXUc6FJWuHwn1Nl8KAGI11rgFqlqvgxH8NpGw bUSM1vhFuGn31FS02V9L4gx72nkfGQ8YWtlZGaDeMJbF+RJfegEG4AcMtqgyiayCOjwZ pm43FzGoZpGQW+naJQNJ1Se8KqTYXPyIfT+r9RIewQgCMTwIWmoRGQH6qbQtZTp+H8RO R1gzpmKT7rYfKL1Vj8pw+TXC4Fm0H13MKggj7L+TsevZXopxLkYDVqIYF73cV4TxhFHs mqGaapvhV7U6gk7c2+A11mJt8hR/S+wl65Hm/4E2aLE6kxDJg8mMaBaKzrHcGRdNn+W+ L5XA== X-Gm-Message-State: AOJu0YxeOSkQ91A2u86zBWLOkguX5qz+V+AJyLNjBns3O2QJeZyhIvSh orv3D4SJ2IZ0CI+2AXk/63oMuWF+EmqlcsAoCJLP84TZhR4zTU+WHZTSIKhEQdREjot9C4iRnpw pCqsbm4KO5vPDie7o4dBRRbwkAvZmuLStetsaNa/WzzrrBlzZDGE+qaMEwtIPEJwCrr7jS7k10A R6deMT0+k= X-Received: by 2002:adf:e74d:0:b0:336:7794:4b9a with SMTP id c13-20020adfe74d000000b0033677944b9amr73869wrn.33.1703179235061; Thu, 21 Dec 2023 09:20:35 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyHPKXMsE72H4kku6pwlUAmJuldnldFpAoOwJxkR3TnLyYF1yjd63LZ84PlZCULyP5AituFQ== X-Received: by 2002:adf:e74d:0:b0:336:7794:4b9a with SMTP id c13-20020adfe74d000000b0033677944b9amr73859wrn.33.1703179234668; Thu, 21 Dec 2023 09:20:34 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id l4-20020a5d6744000000b00336710ddea0sm2459251wrw.59.2023.12.21.09.20.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:33 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 18/21] meson: move CFI detection code earlier Date: Thu, 21 Dec 2023 18:19:55 +0100 Message-ID: <20231221171958.59350-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Keep it together with the other compiler modes, and before dependencies. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/meson.build b/meson.build index f8d61a46ad1..f105462c181 100644 --- a/meson.build +++ b/meson.build @@ -421,6 +421,46 @@ if get_option('fuzzing') endif endif +if get_option('cfi') + cfi_flags=[] + # Check for dependency on LTO + if not get_option('b_lto') + error('Selected Control-Flow Integrity but LTO is disabled') + endif + if enable_modules + error('Selected Control-Flow Integrity is not compatible with modules') + endif + # Check for cfi flags. CFI requires LTO so we can't use + # get_supported_arguments, but need a more complex "compiles" which allows + # custom arguments + if cc.compiles('int main () { return 0; }', name: '-fsanitize=cfi-icall', + args: ['-flto', '-fsanitize=cfi-icall'] ) + cfi_flags += '-fsanitize=cfi-icall' + else + error('-fsanitize=cfi-icall is not supported by the compiler') + endif + if cc.compiles('int main () { return 0; }', + name: '-fsanitize-cfi-icall-generalize-pointers', + args: ['-flto', '-fsanitize=cfi-icall', + '-fsanitize-cfi-icall-generalize-pointers'] ) + cfi_flags += '-fsanitize-cfi-icall-generalize-pointers' + else + error('-fsanitize-cfi-icall-generalize-pointers is not supported by the compiler') + endif + if get_option('cfi_debug') + if cc.compiles('int main () { return 0; }', + name: '-fno-sanitize-trap=cfi-icall', + args: ['-flto', '-fsanitize=cfi-icall', + '-fno-sanitize-trap=cfi-icall'] ) + cfi_flags += '-fno-sanitize-trap=cfi-icall' + else + error('-fno-sanitize-trap=cfi-icall is not supported by the compiler') + endif + endif + add_global_arguments(cfi_flags, native: false, language: all_languages) + add_global_link_arguments(cfi_flags, native: false, language: all_languages) +endif + add_global_arguments(qemu_common_flags, native: false, language: all_languages) add_global_link_arguments(qemu_ldflags, native: false, language: all_languages) @@ -2005,46 +2045,6 @@ endif config_host_data.set('CONFIG_AUDIO_DRIVERS', '"' + '", "'.join(audio_drivers_selected) + '", ') -if get_option('cfi') - cfi_flags=[] - # Check for dependency on LTO - if not get_option('b_lto') - error('Selected Control-Flow Integrity but LTO is disabled') - endif - if enable_modules - error('Selected Control-Flow Integrity is not compatible with modules') - endif - # Check for cfi flags. CFI requires LTO so we can't use - # get_supported_arguments, but need a more complex "compiles" which allows - # custom arguments - if cc.compiles('int main () { return 0; }', name: '-fsanitize=cfi-icall', - args: ['-flto', '-fsanitize=cfi-icall'] ) - cfi_flags += '-fsanitize=cfi-icall' - else - error('-fsanitize=cfi-icall is not supported by the compiler') - endif - if cc.compiles('int main () { return 0; }', - name: '-fsanitize-cfi-icall-generalize-pointers', - args: ['-flto', '-fsanitize=cfi-icall', - '-fsanitize-cfi-icall-generalize-pointers'] ) - cfi_flags += '-fsanitize-cfi-icall-generalize-pointers' - else - error('-fsanitize-cfi-icall-generalize-pointers is not supported by the compiler') - endif - if get_option('cfi_debug') - if cc.compiles('int main () { return 0; }', - name: '-fno-sanitize-trap=cfi-icall', - args: ['-flto', '-fsanitize=cfi-icall', - '-fno-sanitize-trap=cfi-icall'] ) - cfi_flags += '-fno-sanitize-trap=cfi-icall' - else - error('-fno-sanitize-trap=cfi-icall is not supported by the compiler') - endif - endif - add_global_arguments(cfi_flags, native: false, language: all_languages) - add_global_link_arguments(cfi_flags, native: false, language: all_languages) -endif - have_host_block_device = (targetos != 'darwin' or cc.has_header('IOKit/storage/IOMedia.h')) From patchwork Thu Dec 21 17:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879309 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Ef+nv49h; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy2h49Ctz1ySd for ; Fri, 22 Dec 2023 04:23:56 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMix-0007jU-TU; Thu, 21 Dec 2023 12:20:43 -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 1rGMiw-0007hF-9Z for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:42 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rGMiu-0004ZS-RM for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:42 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fAWkdbqYASXrctslh8XXfWgepJaH8Ogk55Uzv0gWBsg=; b=Ef+nv49hB4vykOxexDDF/8y9IkbGLDztJDXyL6APy4sYpyfkhvbSQ2MVZ3F9nfBYg1CdvU EbwH5yP38ejTWB4l6+LzP1oCfIlC3TZMMfrW1lBPD6skaPKVTKnEOE8+R0mSn9Hetk6pfm U/jghVmViOvUlJtALWvXSWTzDxKC1QY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-486-etNln_fAPFK9D3WrQccNHA-1; Thu, 21 Dec 2023 12:20:38 -0500 X-MC-Unique: etNln_fAPFK9D3WrQccNHA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40c691ffb32so8483065e9.0 for ; Thu, 21 Dec 2023 09:20:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179237; x=1703784037; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fAWkdbqYASXrctslh8XXfWgepJaH8Ogk55Uzv0gWBsg=; b=Pm2VNEBuwS1n9oSYWbjIizFHBXgA6olEP4quTOmnlvKZEFLl1jD73ygi/J4TuVNdUa JLy+/t9sJRBUMmAi2q5j9d1jB+Zxu93L1+L+L1uO2AalvsvVI17ijoeKeyTtzQUnMFxI ub84l1lD+7X6grH/jgHzguX38hlPrvfATTftYpxbDAD6R00BCMX0eRUYOqm32eRDlM1X LmgYzbBtFYqz0r7qCquLi/ILFuKKVnJNO4ObaGxwbljzob2csEoKEcziV0Zm+3Xw1Cvr RPvtPC/KsuDY4q6DcEOot9TmJ4Mj/HasmZF9wHD9QmVSrzYmpgOHSU5nqJP2fV7veKoY 0WfA== X-Gm-Message-State: AOJu0Yyf2AGBD7EqIz0uPx9nqPE7Iey1X+JJCOcxaJ5z7UdiD0XXiael VK6tJpYM3i++1ecADxz0G6nxBWTyGhKRNLP6kK5rE0vcy59mvlA/ROApvAsM+uyR6527nT4cvsf qNOeHEK0wIMqT+Owf5fgnaF/xown07LIg76H/UKggxPA/6pr3SbVqunxx2fnR3n9un8NITTCpGr Id3XV9Cy4= X-Received: by 2002:a05:600c:34c1:b0:40c:e76:16d6 with SMTP id d1-20020a05600c34c100b0040c0e7616d6mr23241wmq.57.1703179236906; Thu, 21 Dec 2023 09:20:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlI5RMdr5OXBQ2qno+V/YftSAT6LbHedrzabXO4PokacRAq6Rr4V9PKxsifUKc2AIZGM5n/Q== X-Received: by 2002:a05:600c:34c1:b0:40c:e76:16d6 with SMTP id d1-20020a05600c34c100b0040c0e7616d6mr23236wmq.57.1703179236649; Thu, 21 Dec 2023 09:20:36 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id hg12-20020a05600c538c00b0040c41846923sm11569366wmb.26.2023.12.21.09.20.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:35 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 19/21] meson: move config-host.h definitions together Date: Thu, 21 Dec 2023 18:19:56 +0100 Message-ID: <20231221171958.59350-20-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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_H3=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini --- meson.build | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index f105462c181..57821069e91 100644 --- a/meson.build +++ b/meson.build @@ -40,7 +40,6 @@ qemu_moddir = get_option('libdir') / get_option('qemu_suffix') qemu_desktopdir = get_option('datadir') / 'applications' qemu_icondir = get_option('datadir') / 'icons' -config_host_data = configuration_data() genh = [] qapi_trace_events = [] @@ -137,12 +136,6 @@ elif cpu in ['riscv64'] else kvm_targets = [] endif - -kvm_targets_c = '""' -if get_option('kvm').allowed() and targetos == 'linux' - kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' -endif -config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) accelerator_targets = { 'CONFIG_KVM': kvm_targets } if cpu in ['x86', 'x86_64'] @@ -1107,12 +1100,6 @@ if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu virgl = dependency('virglrenderer', method: 'pkg-config', required: get_option('virglrenderer')) - if virgl.found() - config_host_data.set('HAVE_VIRGL_D3D_INFO_EXT', - cc.has_member('struct virgl_renderer_resource_info_ext', 'd3d_tex2d', - prefix: '#include ', - dependencies: virgl)) - endif endif rutabaga = not_found if not get_option('rutabaga_gfx').auto() or have_system or have_vhost_user_gpu @@ -2004,6 +1991,8 @@ endif # config-host.h # ################# +config_host_data = configuration_data() + audio_drivers_selected = [] if have_system audio_drivers_available = { @@ -2133,6 +2122,12 @@ endif config_host_data.set('HOST_' + host_arch.to_upper(), 1) +kvm_targets_c = '""' +if get_option('kvm').allowed() and targetos == 'linux' + kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' +endif +config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) + if get_option('module_upgrades') and not enable_modules error('Cannot enable module-upgrades as modules are not enabled') endif @@ -2232,6 +2227,12 @@ config_host_data.set('CONFIG_PNG', png.found()) config_host_data.set('CONFIG_VNC', vnc.found()) config_host_data.set('CONFIG_VNC_JPEG', jpeg.found()) config_host_data.set('CONFIG_VNC_SASL', sasl.found()) +if virgl.found() + config_host_data.set('HAVE_VIRGL_D3D_INFO_EXT', + cc.has_member('struct virgl_renderer_resource_info_ext', 'd3d_tex2d', + prefix: '#include ', + dependencies: virgl)) +endif config_host_data.set('CONFIG_VIRTFS', have_virtfs) config_host_data.set('CONFIG_VTE', vte.found()) config_host_data.set('CONFIG_XKBCOMMON', xkbcommon.found()) From patchwork Thu Dec 21 17:19:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=Sa1DmLKA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy1L1PHWz1ySd for ; Fri, 22 Dec 2023 04:22:46 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMjC-0007nU-SK; Thu, 21 Dec 2023 12:20:58 -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 1rGMjB-0007lF-AY for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:57 -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 1rGMix-0004Zr-3m for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179242; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1m2wPSj7DrnfvV9Gjd90UAkjCJ7uIusEMq8OUj5cMGw=; b=Sa1DmLKAQPsVfiiOUcNSqmaXN4I3j4JWyPYfG3yWw6jkoetvuZydriUgOM3Ga5kNMQhDut VxKQHy45Uzt+4jQVsLshnEPQsZPtmzypHuptbDV0XuQphxAT/TbhyKq1ulG0OC+4jcJIW1 8ND5DM3+KWQNbVgKI6UeNOiUhoYjopw= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-201-6gaTSKL4PNyfZoCIUV3qWA-1; Thu, 21 Dec 2023 12:20:40 -0500 X-MC-Unique: 6gaTSKL4PNyfZoCIUV3qWA-1 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-33680148d24so714931f8f.1 for ; Thu, 21 Dec 2023 09:20:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179239; x=1703784039; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1m2wPSj7DrnfvV9Gjd90UAkjCJ7uIusEMq8OUj5cMGw=; b=jWadr3nwi6AIA94febbrYNlF80Qd3MXL0pb6e+T2AW5Hvklq9JHU9LiX2LrKyRexrW WIK4k5WACADrBm74loZ61A0/tkylh2WnpEBBP6pjfBOF3Rnz6mChYvphyrG2AmpFqNle 6KC8DnR5I4xWXVqXUeVcbWAX33f4Dn/NWiBvGaQRISyMDxfCJ/FUzWxC7rnQz466HgYv GfAly+V4km4gd5EjkUPvPi+7SMEehi99sLcuKkYnAAQjrhDq74uovLtL3kXzdeUV0HCQ baBJGVAawXfyeLsV9cGATPVJ6zMK5qTqQ5rTIRO0bcMeIwNEzLtEm2YK9TQzCIFyyV9k bXZg== X-Gm-Message-State: AOJu0Yw6Qij/qjspme3xbPDA+WhV7WfvraHIG/h6eaKgpJ1eWIunVtBR mNuq5J+y0afjCueUvd64a7RkZ+MdYKT9qqQWlO+8QfLm8rPpz2y7mDo6dRjo4Jja8o9GJRREW8t D5pN1MITbHPm7O4lpBxvaSuKkdPQxxzd0ZpLqHHsGI//vJNRR/lsCxofHgGd574B5Rq9fGanAKr 4/UFlL7FI= X-Received: by 2002:a1c:4b18:0:b0:40c:3c72:608f with SMTP id y24-20020a1c4b18000000b0040c3c72608fmr34947wma.17.1703179238773; Thu, 21 Dec 2023 09:20:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IFVtDstDJqDQdErwglKsxecDlXUosCEksWmHUgOJndXe8rkPJ2vokCqT9GCrKBjp3MkNkZxIw== X-Received: by 2002:a1c:4b18:0:b0:40c:3c72:608f with SMTP id y24-20020a1c4b18000000b0040c3c72608fmr34944wma.17.1703179238498; Thu, 21 Dec 2023 09:20:38 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id o20-20020a05600c4fd400b0040b37f1079dsm11811388wmq.29.2023.12.21.09.20.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 20/21] meson: move subdirs to "Collect sources" section Date: Thu, 21 Dec 2023 18:19:57 +0100 Message-ID: <20231221171958.59350-21-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- meson.build | 66 ++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/meson.build b/meson.build index 57821069e91..6cf70cbfb89 100644 --- a/meson.build +++ b/meson.build @@ -3221,39 +3221,6 @@ foreach d : hx_headers endforeach genh += hxdep -################### -# Collect sources # -################### - -authz_ss = ss.source_set() -blockdev_ss = ss.source_set() -block_ss = ss.source_set() -chardev_ss = ss.source_set() -common_ss = ss.source_set() -crypto_ss = ss.source_set() -hwcore_ss = ss.source_set() -io_ss = ss.source_set() -qmp_ss = ss.source_set() -qom_ss = ss.source_set() -system_ss = ss.source_set() -specific_fuzz_ss = ss.source_set() -specific_ss = ss.source_set() -stub_ss = ss.source_set() -trace_ss = ss.source_set() -user_ss = ss.source_set() -util_ss = ss.source_set() - -# accel modules -qtest_module_ss = ss.source_set() -tcg_module_ss = ss.source_set() - -modules = {} -target_modules = {} -hw_arch = {} -target_arch = {} -target_system_arch = {} -target_user_arch = {} - ############### # Trace files # ############### @@ -3368,6 +3335,39 @@ if have_system or have_user ] endif +################### +# Collect sources # +################### + +authz_ss = ss.source_set() +blockdev_ss = ss.source_set() +block_ss = ss.source_set() +chardev_ss = ss.source_set() +common_ss = ss.source_set() +crypto_ss = ss.source_set() +hwcore_ss = ss.source_set() +io_ss = ss.source_set() +qmp_ss = ss.source_set() +qom_ss = ss.source_set() +system_ss = ss.source_set() +specific_fuzz_ss = ss.source_set() +specific_ss = ss.source_set() +stub_ss = ss.source_set() +trace_ss = ss.source_set() +user_ss = ss.source_set() +util_ss = ss.source_set() + +# accel modules +qtest_module_ss = ss.source_set() +tcg_module_ss = ss.source_set() + +modules = {} +target_modules = {} +hw_arch = {} +target_arch = {} +target_system_arch = {} +target_user_arch = {} + # NOTE: the trace/ subdirectory needs the qapi_trace_events variable # that is filled in by qapi/. subdir('qapi') From patchwork Thu Dec 21 17:19:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 1879306 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=dJ1OmTIP; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) 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=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Swy2W2mc7z1ySd for ; Fri, 22 Dec 2023 04:23:47 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rGMj8-0007kp-GE; Thu, 21 Dec 2023 12:20:54 -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 1rGMj6-0007kX-P8 for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:52 -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 1rGMj2-0004ef-Aj for qemu-devel@nongnu.org; Thu, 21 Dec 2023 12:20:52 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1703179246; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o4uVjNyp+2pe0deYxzBMA34yvN2nwkTTTUs2trReG2U=; b=dJ1OmTIPL3/OlRdq5RPTNRMFaZwhsbvahlwvhyj3ceI6ntqKyQuRFsnVgDL50/cULPEko9 nsT8DHbaHze7XOKTDWXDs+S5buAhlxVGvEYzU2a+vPM6wtOHDRLytfT/34+gPMLiSA6xmx Ftu5SYqHreex0SgEZt58y4xmrxJL1yA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-619-52JXoOY9Npe02H7YxVxvkg-1; Thu, 21 Dec 2023 12:20:44 -0500 X-MC-Unique: 52JXoOY9Npe02H7YxVxvkg-1 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-40d3b0783beso7351905e9.3 for ; Thu, 21 Dec 2023 09:20:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703179242; x=1703784042; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=o4uVjNyp+2pe0deYxzBMA34yvN2nwkTTTUs2trReG2U=; b=QV3b2XdQza5Vm4tUAU4LnDabtQz7IxTIBAsEOsCoeqQ8k+BZGsuN453eIsqRB20JQi wWfOm8xdn4JIJjUP7VZgyH2u6SXGg7v4ERh3lEPwQ8NCOuZgDppenoiHfewUquZmncDn vnXBssgam9eHFou6CABoVindO0BXOOyEulwQCnOdFc5o39vaRZT2aOYZh0TNOm7CJwz+ kcj2OG9njHvZVOzsemP7MLmMiSZ90Rjsjbwe+OXqImwIghwfWpQW6J2oRKoARlxQCHTj SRVjBwuHazIsVNKnpc+5UPJasuAcRixlp2ARCMr3xi9nQspqFrxpdlJ0ycZhkt4KBUH6 +vNw== X-Gm-Message-State: AOJu0YyLkucAabDqM8UHJyVlQwZWBNN3YIFFj5ZjzKdUDCvjc3bQjLho x4vCarV58U47Ln69fxhJQyGbKufjFQ/A0ot/iSvSm9T1qdLVuTzFGmR4cMbNcy95Cu8duDNEg12 U+ttPBEdZOjdnO4ORos3aI2CziBZRtTkndqYi7xKsDcVXSjIrkCQ23ZHoQf0AGeKNquBc9zngA/ I0/if4+OU= X-Received: by 2002:a05:600c:3201:b0:40b:4c54:3d78 with SMTP id r1-20020a05600c320100b0040b4c543d78mr38119wmp.28.1703179241392; Thu, 21 Dec 2023 09:20:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IG24+qmmUgbFYcEpbJZ1IvtTAYXi2RSbCgwyL1qm8ODmP14Vw19bFG6XwfqQUSV+xI7cV7Fow== X-Received: by 2002:a05:600c:3201:b0:40b:4c54:3d78 with SMTP id r1-20020a05600c320100b0040b4c543d78mr38094wmp.28.1703179239941; Thu, 21 Dec 2023 09:20:39 -0800 (PST) Received: from [192.168.10.118] ([2001:b07:6468:f312:4783:a68:c1ee:15c5]) by smtp.gmail.com with ESMTPSA id k4-20020a5d5244000000b003368c8d120fsm1072350wrc.7.2023.12.21.09.20.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Dec 2023 09:20:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 21/21] configure, meson: rename targetos to host_os Date: Thu, 21 Dec 2023 18:19:58 +0100 Message-ID: <20231221171958.59350-22-pbonzini@redhat.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231221171958.59350-1-pbonzini@redhat.com> References: <20231221171958.59350-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.061, 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This variable is about the host OS, not the target. It is used a lot more since the Meson conversion, but the original sin dates back to 2003. Time to fix it. Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daudé --- accel/tcg/meson.build | 2 +- backends/meson.build | 4 +- block/meson.build | 4 +- bsd-user/meson.build | 2 +- chardev/meson.build | 4 +- configure | 58 ++++---- contrib/ivshmem-client/meson.build | 2 +- contrib/ivshmem-server/meson.build | 2 +- contrib/vhost-user-blk/meson.build | 2 +- contrib/vhost-user-input/meson.build | 2 +- contrib/vhost-user-scsi/meson.build | 2 +- docs/devel/kconfig.rst | 2 +- fsdev/meson.build | 2 +- hw/9pfs/meson.build | 4 +- hw/display/meson.build | 2 +- hw/ppc/meson.build | 2 +- hw/usb/meson.build | 4 +- meson.build | 206 +++++++++++++-------------- net/can/meson.build | 2 +- net/meson.build | 8 +- plugins/meson.build | 4 +- qga/meson.build | 16 +-- scsi/meson.build | 2 +- system/meson.build | 4 +- tests/fp/meson.build | 2 +- tests/meson.build | 2 +- tests/plugin/meson.build | 2 +- tests/qemu-iotests/meson.build | 2 +- tests/qtest/meson.build | 10 +- tests/unit/meson.build | 8 +- ui/dbus-display1.xml | 10 +- ui/meson.build | 8 +- util/meson.build | 8 +- 33 files changed, 197 insertions(+), 197 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 1dad6bbbfbd..d25638d6c15 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -17,7 +17,7 @@ if get_option('plugins') tcg_ss.add(files('plugin-gen.c')) endif tcg_ss.add(when: libdw, if_true: files('debuginfo.c')) -if targetos == 'linux' +if host_os == 'linux' tcg_ss.add(files('perf.c')) endif specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) diff --git a/backends/meson.build b/backends/meson.build index 6dee4e9203b..8b2b111497f 100644 --- a/backends/meson.build +++ b/backends/meson.build @@ -10,11 +10,11 @@ system_ss.add([files( 'confidential-guest-support.c', ), numa]) -if targetos != 'windows' +if host_os != 'windows' system_ss.add(files('rng-random.c')) system_ss.add(files('hostmem-file.c')) endif -if targetos == 'linux' +if host_os == 'linux' system_ss.add(files('hostmem-memfd.c')) endif if keyutils.found() diff --git a/block/meson.build b/block/meson.build index ddea1e40070..e1f03fd773e 100644 --- a/block/meson.build +++ b/block/meson.build @@ -88,13 +88,13 @@ if get_option('parallels').allowed() block_ss.add(files('parallels.c', 'parallels-ext.c')) endif -if targetos == 'windows' +if host_os == 'windows' block_ss.add(files('file-win32.c', 'win32-aio.c')) else block_ss.add(files('file-posix.c'), coref, iokit) endif block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) -if targetos == 'linux' +if host_os == 'linux' block_ss.add(files('nvme.c')) endif if get_option('replication').allowed() diff --git a/bsd-user/meson.build b/bsd-user/meson.build index c6bfd3b2b53..39bad0ae33e 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -24,6 +24,6 @@ kvm = cc.find_library('kvm', required: true) bsd_user_ss.add(elf, procstat, kvm) # Pull in the OS-specific build glue, if any -subdir(targetos) +subdir(host_os) specific_ss.add_all(when: 'CONFIG_BSD_USER', if_true: bsd_user_ss) diff --git a/chardev/meson.build b/chardev/meson.build index db6840b71af..c80337d15fa 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -12,7 +12,7 @@ chardev_ss.add(files( 'char-udp.c', 'char.c', )) -if targetos == 'windows' +if host_os == 'windows' chardev_ss.add(files( 'char-console.c', 'char-win-stdio.c', @@ -23,7 +23,7 @@ else 'char-fd.c', 'char-pty.c', ), util) - if targetos in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly'] + if host_os in ['linux', 'gnu/kfreebsd', 'freebsd', 'dragonfly'] chardev_ss.add(files('char-parallel.c')) endif endif diff --git a/configure b/configure index 38ca267096f..134010844d9 100755 --- a/configure +++ b/configure @@ -334,30 +334,30 @@ EOF } if check_define __linux__ ; then - targetos=linux + host_os=linux elif check_define _WIN32 ; then - targetos=windows + host_os=windows elif check_define __OpenBSD__ ; then - targetos=openbsd + host_os=openbsd elif check_define __sun__ ; then - targetos=sunos + host_os=sunos elif check_define __HAIKU__ ; then - targetos=haiku + host_os=haiku elif check_define __FreeBSD__ ; then - targetos=freebsd + host_os=freebsd elif check_define __FreeBSD_kernel__ && check_define __GLIBC__; then - targetos=gnu/kfreebsd + host_os=gnu/kfreebsd elif check_define __DragonFly__ ; then - targetos=dragonfly + host_os=dragonfly elif check_define __NetBSD__; then - targetos=netbsd + host_os=netbsd elif check_define __APPLE__; then - targetos=darwin + host_os=darwin else # This is a fatal error, but don't report it yet, because we # might be going to just print the --help text, or it might # be the result of a missing compiler. - targetos=bogus + host_os=bogus fi if test ! -z "$cpu" ; then @@ -573,13 +573,13 @@ do fi done -if test "$targetos" = "windows" ; then +if test "$host_os" = "windows" ; then EXESUF=".exe" fi meson_option_build_array() { printf '[' - (if test "$targetos" = windows; then + (if test "$host_os" = windows; then IFS=\; else IFS=: @@ -802,7 +802,7 @@ mak_wilds="" if [ -n "$host_arch" ] && [ -d "$source_path/common-user/host/$host_arch" ]; then if [ "$linux_user" != no ]; then - if [ "$targetos" = linux ]; then + if [ "$host_os" = linux ]; then linux_user=yes elif [ "$linux_user" = yes ]; then error_exit "linux-user not supported on this architecture" @@ -813,9 +813,9 @@ if [ -n "$host_arch" ] && [ -d "$source_path/common-user/host/$host_arch" ]; the fi if [ "$bsd_user" != no ]; then if [ "$bsd_user" = "" ]; then - test $targetos = freebsd && bsd_user=yes + test $host_os = freebsd && bsd_user=yes fi - if [ "$bsd_user" = yes ] && ! [ -d "$source_path/bsd-user/$targetos" ]; then + if [ "$bsd_user" = yes ] && ! [ -d "$source_path/bsd-user/$host_os" ]; then error_exit "bsd-user not supported on this host OS" fi if [ "$bsd_user" = "yes" ]; then @@ -998,7 +998,7 @@ if test -z "$ninja"; then fi fi -if test "$targetos" = "bogus"; then +if test "$host_os" = "bogus"; then # Now that we know that we're not printing the help and that # the compiler works (so the results of the check_defines we used # to identify the OS are reliable), if we didn't recognize the @@ -1007,7 +1007,7 @@ if test "$targetos" = "bogus"; then fi # test for any invalid configuration combinations -if test "$targetos" = "windows" && ! has "$dlltool"; then +if test "$host_os" = "windows" && ! has "$dlltool"; then if test "$plugins" = "yes"; then error_exit "TCG plugins requires dlltool to build on Windows platforms" fi @@ -1041,7 +1041,7 @@ static THREAD int tls_var; int main(void) { return tls_var; } EOF -if test "$targetos" = windows || test "$targetos" = haiku; then +if test "$host_os" = windows || test "$host_os" = haiku; then if test "$pie" = "yes"; then error_exit "PIE not available due to missing OS support" fi @@ -1540,8 +1540,8 @@ echo "# Automatically generated by configure - do not modify" > Makefile.prereqs # Mac OS X ships with a broken assembler if have_target i386-softmmu x86_64-softmmu && \ - test "$targetos" != "darwin" && test "$targetos" != "sunos" && \ - test "$targetos" != "haiku" && \ + test "$host_os" != "darwin" && test "$host_os" != "sunos" && \ + test "$host_os" != "haiku" && \ probe_target_compiler i386-softmmu; then subdirs="$subdirs pc-bios/optionrom" config_mak=pc-bios/optionrom/config.mak @@ -1605,7 +1605,7 @@ echo "NINJA=$ninja" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak # use included Linux headers for KVM architectures -if test "$targetos" = "linux" && test -n "$linux_arch"; then +if test "$host_os" = "linux" && test -n "$linux_arch"; then symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm fi @@ -1628,13 +1628,13 @@ echo "SRC_PATH=$source_path/contrib/plugins" >> contrib/plugins/$config_host_mak echo "PKG_CONFIG=${pkg_config}" >> contrib/plugins/$config_host_mak echo "CC=$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak echo "CFLAGS=${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins/$config_host_mak -if test "$targetos" = windows; then +if test "$host_os" = windows; then echo "DLLTOOL=$dlltool" >> contrib/plugins/$config_host_mak fi -if test "$targetos" = darwin; then +if test "$host_os" = darwin; then echo "CONFIG_DARWIN=y" >> contrib/plugins/$config_host_mak fi -if test "$targetos" = windows; then +if test "$host_os" = windows; then echo "CONFIG_WIN32=y" >> contrib/plugins/$config_host_mak fi @@ -1714,7 +1714,7 @@ if test "$skip_meson" = no; then echo "# environment defaults, can still be overridden on " >> $cross echo "# the command line" >> $cross if test -e "$source_path/.git" && \ - { test "$targetos" = linux || test "$targetos" = "windows"; }; then + { test "$host_os" = linux || test "$host_os" = "windows"; }; then echo 'werror = true' >> $cross fi echo "[project options]" >> $cross @@ -1751,7 +1751,7 @@ if test "$skip_meson" = no; then echo "windmc = [$(meson_quote $windmc)]" >> $cross if test "$cross_compile" = "yes"; then echo "[host_machine]" >> $cross - echo "system = '$targetos'" >> $cross + echo "system = '$host_os'" >> $cross case "$cpu" in i386) echo "cpu_family = 'x86'" >> $cross @@ -1777,8 +1777,8 @@ if test "$skip_meson" = no; then fi mv $cross config-meson.cross meson_add_machine_file config-meson.cross - if test -f "$source_path/configs/meson/$targetos.txt"; then - meson_add_machine_file $source_path/configs/meson/$targetos.txt + if test -f "$source_path/configs/meson/$host_os.txt"; then + meson_add_machine_file $source_path/configs/meson/$host_os.txt fi rm -rf meson-private meson-info meson-logs diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/meson.build index ce8dcca84dd..3c8b09af4bf 100644 --- a/contrib/ivshmem-client/meson.build +++ b/contrib/ivshmem-client/meson.build @@ -1,4 +1,4 @@ executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), genh, dependencies: glib, - build_by_default: targetos == 'linux', + build_by_default: host_os == 'linux', install: false) diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build index c6c3c82e89f..1c8fea6594d 100644 --- a/contrib/ivshmem-server/meson.build +++ b/contrib/ivshmem-server/meson.build @@ -1,4 +1,4 @@ executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), genh, dependencies: [qemuutil, rt], - build_by_default: targetos == 'linux', + build_by_default: host_os == 'linux', install: false) diff --git a/contrib/vhost-user-blk/meson.build b/contrib/vhost-user-blk/meson.build index dcb9e2ffcd0..ac1eece37a4 100644 --- a/contrib/vhost-user-blk/meson.build +++ b/contrib/vhost-user-blk/meson.build @@ -1,4 +1,4 @@ executable('vhost-user-blk', files('vhost-user-blk.c'), dependencies: [qemuutil, vhost_user], - build_by_default: targetos == 'linux', + build_by_default: host_os == 'linux', install: false) diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-input/meson.build index 21a9ed4f15e..840d866594b 100644 --- a/contrib/vhost-user-input/meson.build +++ b/contrib/vhost-user-input/meson.build @@ -1,4 +1,4 @@ executable('vhost-user-input', files('main.c'), dependencies: [qemuutil, vhost_user], - build_by_default: targetos == 'linux', + build_by_default: host_os == 'linux', install: false) diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build index cc893f6f203..44be04853e4 100644 --- a/contrib/vhost-user-scsi/meson.build +++ b/contrib/vhost-user-scsi/meson.build @@ -1,6 +1,6 @@ if libiscsi.found() executable('vhost-user-scsi', files('vhost-user-scsi.c'), dependencies: [qemuutil, libiscsi, vhost_user], - build_by_default: targetos == 'linux', + build_by_default: host_os == 'linux', install: false) endif diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index 73f52de1067..ccb9a46bd77 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -316,6 +316,6 @@ variable:: host_kconfig = \ (have_tpm ? ['CONFIG_TPM=y'] : []) + \ - (targetos == 'linux' ? ['CONFIG_LINUX=y'] : []) + \ + (host_os == 'linux' ? ['CONFIG_LINUX=y'] : []) + \ (have_ivshmem ? ['CONFIG_IVSHMEM=y'] : []) + \ ... diff --git a/fsdev/meson.build b/fsdev/meson.build index db67530d7f2..e20d7255e1e 100644 --- a/fsdev/meson.build +++ b/fsdev/meson.build @@ -5,7 +5,7 @@ fsdev_ss.add(when: ['CONFIG_FSDEV_9P'], if_true: files( '9p-marshal.c', 'qemu-fsdev.c', ), if_false: files('qemu-fsdev-dummy.c')) -if targetos in ['linux', 'darwin'] +if host_os in ['linux', 'darwin'] system_ss.add_all(fsdev_ss) endif diff --git a/hw/9pfs/meson.build b/hw/9pfs/meson.build index 3eee7c268a9..f1b62fa8c80 100644 --- a/hw/9pfs/meson.build +++ b/hw/9pfs/meson.build @@ -13,9 +13,9 @@ fs_ss.add(files( 'coth.c', 'coxattr.c', )) -if targetos == 'darwin' +if host_os == 'darwin' fs_ss.add(files('9p-util-darwin.c')) -elif targetos == 'linux' +elif host_os == 'linux' fs_ss.add(files('9p-util-linux.c')) endif fs_ss.add(when: 'CONFIG_XEN_BUS', if_true: files('xen-9p-backend.c')) diff --git a/hw/display/meson.build b/hw/display/meson.build index ac0159c516e..f93a69f70f4 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -69,7 +69,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss = ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), pixman]) - if targetos == 'linux' + if host_os == 'linux' virtio_gpu_ss.add(files('virtio-gpu-udmabuf.c')) else virtio_gpu_ss.add(files('virtio-gpu-udmabuf-stubs.c')) diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index 3dedcf3043d..eba3406e7f3 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -34,7 +34,7 @@ ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files( 'spapr_softmmu.c', )) ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c')) -if targetos == 'linux' +if host_os == 'linux' ppc_ss.add(when: 'CONFIG_PSERIES', if_true: files( 'spapr_pci_vfio.c', )) diff --git a/hw/usb/meson.build b/hw/usb/meson.build index b7755b638fc..2c13c528785 100644 --- a/hw/usb/meson.build +++ b/hw/usb/meson.build @@ -44,7 +44,7 @@ system_ss.add(when: 'CONFIG_USB_STORAGE_UAS', if_true: files('dev-uas.c')) system_ss.add(when: 'CONFIG_USB_AUDIO', if_true: files('dev-audio.c')) system_ss.add(when: 'CONFIG_USB_SERIAL', if_true: files('dev-serial.c')) system_ss.add(when: 'CONFIG_USB_NETWORK', if_true: files('dev-network.c')) -if targetos != 'windows' +if host_os != 'windows' system_ss.add(when: 'CONFIG_USB_STORAGE_MTP', if_true: files('dev-mtp.c')) endif @@ -60,7 +60,7 @@ endif # U2F system_ss.add(when: 'CONFIG_USB_U2F', if_true: files('u2f.c')) -if targetos == 'linux' +if host_os == 'linux' system_ss.add(when: 'CONFIG_USB_U2F', if_true: [libudev, files('u2f-passthru.c')]) endif if u2f.found() diff --git a/meson.build b/meson.build index 6cf70cbfb89..eed49e4201b 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ keyval = import('keyval') ss = import('sourceset') fs = import('fs') -targetos = host_machine.system() +host_os = host_machine.system() config_host = keyval.load(meson.current_build_dir() / 'config-host.mak') # Temporary directory used for files created while @@ -61,11 +61,11 @@ python = import('python').find_installation() cc = meson.get_compiler('c') all_languages = ['c'] -if targetos == 'windows' and add_languages('cpp', required: false, native: false) +if host_os == 'windows' and add_languages('cpp', required: false, native: false) all_languages += ['cpp'] cxx = meson.get_compiler('cpp') endif -if targetos == 'darwin' and \ +if host_os == 'darwin' and \ add_languages('objc', required: get_option('cocoa'), native: false) all_languages += ['objc'] objc = meson.get_compiler('objc') @@ -164,7 +164,7 @@ endif modular_tcg = [] # Darwin does not support references to thread-local variables in modules -if targetos != 'darwin' +if host_os != 'darwin' modular_tcg = ['i386-softmmu', 'x86_64-softmmu'] endif @@ -204,18 +204,18 @@ qemu_common_flags = [ qemu_cflags = [] qemu_ldflags = [] -if targetos == 'darwin' +if host_os == 'darwin' # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. if compiler.get_id() == 'gcc' qemu_common_flags += '-DOS_OBJECT_USE_OBJC=0' endif -elif targetos == 'sunos' +elif host_os == 'sunos' # needed for CMSG_ macros in sys/socket.h qemu_common_flags += '-D_XOPEN_SOURCE=600' # needed for TIOCWIN* defines in termios.h qemu_common_flags += '-D__EXTENSIONS__' -elif targetos == 'haiku' +elif host_os == 'haiku' qemu_common_flags += ['-DB_USE_POSITIVE_POSIX_ERRORS', '-D_BSD_SOURCE', '-fPIC'] endif @@ -299,10 +299,10 @@ ucontext_probe = ''' # For POSIX prefer ucontext, but it's not always possible. The fallback # is sigcontext. supported_backends = [] -if targetos == 'windows' +if host_os == 'windows' supported_backends += ['windows'] else - if targetos != 'darwin' and cc.links(ucontext_probe) + if host_os != 'darwin' and cc.links(ucontext_probe) supported_backends += ['ucontext'] endif supported_backends += ['sigaltstack'] @@ -373,13 +373,13 @@ endif # The combination is known as "full relro", because .got.plt is read-only too. qemu_ldflags += cc.get_supported_link_arguments('-Wl,-z,relro', '-Wl,-z,now') -if targetos == 'windows' +if host_os == 'windows' qemu_ldflags += cc.get_supported_link_arguments('-Wl,--no-seh', '-Wl,--nxcompat') qemu_ldflags += cc.get_supported_link_arguments('-Wl,--dynamicbase', '-Wl,--high-entropy-va') endif # Exclude --warn-common with TSan to suppress warnings from the TSan libraries. -if targetos != 'sunos' and not get_option('tsan') +if host_os != 'sunos' and not get_option('tsan') qemu_ldflags += cc.get_supported_link_arguments('-Wl,--warn-common') endif @@ -489,7 +489,7 @@ warn_flags = [ '-Wshadow=local', ] -if targetos != 'darwin' +if host_os != 'darwin' warn_flags += ['-Wthread-safety'] endif @@ -509,7 +509,7 @@ if 'objc' in all_languages # Note sanitizer flags are not applied to Objective-C sources! add_project_arguments(objc.get_supported_arguments(warn_flags), native: false, language: 'objc') endif -if targetos == 'linux' +if host_os == 'linux' add_project_arguments('-isystem', meson.current_source_dir() / 'linux-headers', '-isystem', 'linux-headers', language: all_languages) @@ -556,7 +556,7 @@ if get_option('fuzzing') and get_option('fuzzing_engine') == '' and \ endif # Tracing backends -if 'ftrace' in get_option('trace_backends') and targetos != 'linux' +if 'ftrace' in get_option('trace_backends') and host_os != 'linux' error('ftrace is supported only on Linux') endif if 'syslog' in get_option('trace_backends') and not cc.compiles(''' @@ -571,18 +571,18 @@ endif # Miscellaneous Linux-only features get_option('mpath') \ - .require(targetos == 'linux', error_message: 'Multipath is supported only on Linux') + .require(host_os == 'linux', error_message: 'Multipath is supported only on Linux') multiprocess_allowed = get_option('multiprocess') \ - .require(targetos == 'linux', error_message: 'Multiprocess QEMU is supported only on Linux') \ + .require(host_os == 'linux', error_message: 'Multiprocess QEMU is supported only on Linux') \ .allowed() vfio_user_server_allowed = get_option('vfio_user_server') \ - .require(targetos == 'linux', error_message: 'vfio-user server is supported only on Linux') \ + .require(host_os == 'linux', error_message: 'vfio-user server is supported only on Linux') \ .allowed() have_tpm = get_option('tpm') \ - .require(targetos != 'windows', error_message: 'TPM emulation only available on POSIX systems') \ + .require(host_os != 'windows', error_message: 'TPM emulation only available on POSIX systems') \ .allowed() # type of binaries to build @@ -601,13 +601,13 @@ have_tools = get_option('tools') \ .allowed() have_ga = get_option('guest_agent') \ .disable_auto_if(not have_system and not have_tools) \ - .require(targetos in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd', 'openbsd'], + .require(host_os in ['sunos', 'linux', 'windows', 'freebsd', 'netbsd', 'openbsd'], error_message: 'unsupported OS for QEMU guest agent') \ .allowed() have_block = have_system or have_tools enable_modules = get_option('modules') \ - .require(targetos != 'windows', + .require(host_os != 'windows', error_message: 'Modules are not available for Windows') \ .require(not get_option('prefer_static'), error_message: 'Modules are incompatible with static linking') \ @@ -615,14 +615,14 @@ enable_modules = get_option('modules') \ # vhost have_vhost_user = get_option('vhost_user') \ - .disable_auto_if(targetos != 'linux') \ - .require(targetos != 'windows', + .disable_auto_if(host_os != 'linux') \ + .require(host_os != 'windows', error_message: 'vhost-user is not available on Windows').allowed() have_vhost_vdpa = get_option('vhost_vdpa') \ - .require(targetos == 'linux', + .require(host_os == 'linux', error_message: 'vhost-vdpa is only available on Linux').allowed() have_vhost_kernel = get_option('vhost_kernel') \ - .require(targetos == 'linux', + .require(host_os == 'linux', error_message: 'vhost-kernel is only available on Linux').allowed() have_vhost_user_crypto = get_option('vhost_crypto') \ .require(have_vhost_user, @@ -637,10 +637,10 @@ have_vhost_net = have_vhost_net_kernel or have_vhost_net_user or have_vhost_net_ # Target-specific configuration of accelerators accelerators = [] -if get_option('kvm').allowed() and targetos == 'linux' +if get_option('kvm').allowed() and host_os == 'linux' accelerators += 'CONFIG_KVM' endif -if get_option('whpx').allowed() and targetos == 'windows' +if get_option('whpx').allowed() and host_os == 'windows' if get_option('whpx').enabled() and host_machine.cpu() != 'x86_64' error('WHPX requires 64-bit host') elif cc.has_header('winhvplatform.h', required: get_option('whpx')) and \ @@ -655,7 +655,7 @@ if get_option('hvf').allowed() accelerators += 'CONFIG_HVF' endif endif -if targetos == 'netbsd' +if host_os == 'netbsd' nvmm = cc.find_library('nvmm', required: get_option('nvmm')) if nvmm.found() accelerators += 'CONFIG_NVMM' @@ -721,7 +721,7 @@ midl = not_found widl = not_found pathcch = not_found host_dsosuf = '.so' -if targetos == 'windows' +if host_os == 'windows' midl = find_program('midl', required: false) widl = find_program('widl', required: false) pathcch = cc.find_library('pathcch') @@ -733,19 +733,19 @@ if targetos == 'windows' depend_files: files('pc-bios/qemu-nsis.ico'), include_directories: include_directories('.')) host_dsosuf = '.dll' -elif targetos == 'darwin' +elif host_os == 'darwin' coref = dependency('appleframeworks', modules: 'CoreFoundation') iokit = dependency('appleframeworks', modules: 'IOKit', required: false) host_dsosuf = '.dylib' -elif targetos == 'sunos' +elif host_os == 'sunos' socket = [cc.find_library('socket'), cc.find_library('nsl'), cc.find_library('resolv')] -elif targetos == 'haiku' +elif host_os == 'haiku' socket = [cc.find_library('posix_error_mapper'), cc.find_library('network'), cc.find_library('bsd')] -elif targetos == 'openbsd' +elif host_os == 'openbsd' if get_option('tcg').allowed() and target_dirs.length() > 0 # Disable OpenBSD W^X if available emulator_link_args = cc.get_supported_link_arguments('-Wl,-z,wxneeded') @@ -774,7 +774,7 @@ endif # This workaround is required due to a bug in pkg-config file for glib as it # doesn't define GLIB_STATIC_COMPILATION for pkg-config --static -if targetos == 'windows' and get_option('prefer_static') +if host_os == 'windows' and get_option('prefer_static') glib_cflags += ['-DGLIB_STATIC_COMPILATION'] endif @@ -1035,12 +1035,12 @@ if vde.found() and not cc.links(''' endif pulse = not_found -if not get_option('pa').auto() or (targetos == 'linux' and have_system) +if not get_option('pa').auto() or (host_os == 'linux' and have_system) pulse = dependency('libpulse', required: get_option('pa'), method: 'pkg-config') endif alsa = not_found -if not get_option('alsa').auto() or (targetos == 'linux' and have_system) +if not get_option('alsa').auto() or (host_os == 'linux' and have_system) alsa = dependency('alsa', required: get_option('alsa'), method: 'pkg-config') endif @@ -1050,7 +1050,7 @@ if not get_option('jack').auto() or have_system method: 'pkg-config') endif pipewire = not_found -if not get_option('pipewire').auto() or (targetos == 'linux' and have_system) +if not get_option('pipewire').auto() or (host_os == 'linux' and have_system) pipewire = dependency('libpipewire-0.3', version: '>=0.3.60', required: get_option('pipewire'), method: 'pkg-config') @@ -1095,7 +1095,7 @@ if not get_option('zstd').auto() or have_block endif virgl = not_found -have_vhost_user_gpu = have_tools and targetos == 'linux' and pixman.found() +have_vhost_user_gpu = have_tools and host_os == 'linux' and pixman.found() if not get_option('virglrenderer').auto() or have_system or have_vhost_user_gpu virgl = dependency('virglrenderer', method: 'pkg-config', @@ -1120,7 +1120,7 @@ if not get_option('curl').auto() or have_block required: get_option('curl')) endif libudev = not_found -if targetos == 'linux' and (have_system or have_tools) +if host_os == 'linux' and (have_system or have_tools) libudev = dependency('libudev', method: 'pkg-config', required: get_option('libudev')) @@ -1128,7 +1128,7 @@ endif mpathlibs = [libudev] mpathpersist = not_found -if targetos == 'linux' and have_tools and get_option('mpath').allowed() +if host_os == 'linux' and have_tools and get_option('mpath').allowed() mpath_test_source = ''' #include #include @@ -1199,7 +1199,7 @@ if have_system and get_option('curses').allowed() return 0; }''' - curses_dep_list = targetos == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw'] + curses_dep_list = host_os == 'windows' ? ['ncurses', 'ncursesw'] : ['ncursesw'] curses = dependency(curses_dep_list, required: false, method: 'pkg-config') @@ -1216,13 +1216,13 @@ if have_system and get_option('curses').allowed() endif if not curses.found() has_curses_h = cc.has_header('curses.h', args: curses_compile_args) - if targetos != 'windows' and not has_curses_h + if host_os != 'windows' and not has_curses_h message('Trying with /usr/include/ncursesw') curses_compile_args += ['-I/usr/include/ncursesw'] has_curses_h = cc.has_header('curses.h', args: curses_compile_args) endif if has_curses_h - curses_libname_list = (targetos == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) + curses_libname_list = (host_os == 'windows' ? ['pdcurses'] : ['ncursesw', 'cursesw']) foreach curses_libname : curses_libname_list libcurses = cc.find_library(curses_libname, required: false) @@ -1445,7 +1445,7 @@ oss = not_found if get_option('oss').allowed() and have_system if not cc.has_header('sys/soundcard.h') # not found - elif targetos == 'netbsd' + elif host_os == 'netbsd' oss = cc.find_library('ossaudio', required: get_option('oss')) else oss = declare_dependency() @@ -1458,7 +1458,7 @@ if get_option('oss').allowed() and have_system endif endif dsound = not_found -if not get_option('dsound').auto() or (targetos == 'windows' and have_system) +if not get_option('dsound').auto() or (host_os == 'windows' and have_system) if cc.has_header('dsound.h') dsound = declare_dependency(link_args: ['-lole32', '-ldxguid']) endif @@ -1471,7 +1471,7 @@ if not get_option('dsound').auto() or (targetos == 'windows' and have_system) endif coreaudio = not_found -if not get_option('coreaudio').auto() or (targetos == 'darwin' and have_system) +if not get_option('coreaudio').auto() or (host_os == 'darwin' and have_system) coreaudio = dependency('appleframeworks', modules: 'CoreAudio', required: get_option('coreaudio')) endif @@ -1811,7 +1811,7 @@ endif have_xen_pci_passthrough = get_option('xen_pci_passthrough') \ .require(xen.found(), error_message: 'Xen PCI passthrough requested but Xen not enabled') \ - .require(targetos == 'linux', + .require(host_os == 'linux', error_message: 'Xen PCI passthrough not available on this platform') \ .require(cpu == 'x86' or cpu == 'x86_64', error_message: 'Xen PCI passthrough not available on this platform') \ @@ -1906,7 +1906,7 @@ has_statx = cc.has_header_symbol('sys/stat.h', 'STATX_BASIC_STATS', prefix: gnu_ has_statx_mnt_id = cc.has_header_symbol('sys/stat.h', 'STATX_MNT_ID', prefix: gnu_source_prefix) have_vhost_user_blk_server = get_option('vhost_user_blk_server') \ - .require(targetos == 'linux', + .require(host_os == 'linux', error_message: 'vhost_user_blk_server requires linux') \ .require(have_vhost_user, error_message: 'vhost_user_blk_server requires vhost-user support') \ @@ -1934,18 +1934,18 @@ if get_option('fuse_lseek').allowed() endif endif -have_libvduse = (targetos == 'linux') +have_libvduse = (host_os == 'linux') if get_option('libvduse').enabled() - if targetos != 'linux' + if host_os != 'linux' error('libvduse requires linux') endif elif get_option('libvduse').disabled() have_libvduse = false endif -have_vduse_blk_export = (have_libvduse and targetos == 'linux') +have_vduse_blk_export = (have_libvduse and host_os == 'linux') if get_option('vduse_blk_export').enabled() - if targetos != 'linux' + if host_os != 'linux' error('vduse_blk_export requires linux') elif not have_libvduse error('vduse_blk_export requires libvduse support') @@ -2013,7 +2013,7 @@ if have_system # Default to native drivers first, OSS second, SDL third audio_drivers_priority = \ [ 'pa', 'coreaudio', 'dsound', 'sndio', 'oss' ] + \ - (targetos == 'linux' ? [] : [ 'sdl' ]) + (host_os == 'linux' ? [] : [ 'sdl' ]) audio_drivers_default = [] foreach k: audio_drivers_priority if audio_drivers_available[k] @@ -2034,7 +2034,7 @@ endif config_host_data.set('CONFIG_AUDIO_DRIVERS', '"' + '", "'.join(audio_drivers_selected) + '", ') -have_host_block_device = (targetos != 'darwin' or +have_host_block_device = (host_os != 'darwin' or cc.has_header('IOKit/storage/IOMedia.h')) dbus_display = get_option('dbus_display') \ @@ -2045,17 +2045,17 @@ dbus_display = get_option('dbus_display') \ .allowed() have_virtfs = get_option('virtfs') \ - .require(targetos == 'linux' or targetos == 'darwin', + .require(host_os == 'linux' or host_os == 'darwin', error_message: 'virtio-9p (virtfs) requires Linux or macOS') \ - .require(targetos == 'linux' or cc.has_function('pthread_fchdir_np'), + .require(host_os == 'linux' or cc.has_function('pthread_fchdir_np'), error_message: 'virtio-9p (virtfs) on macOS requires the presence of pthread_fchdir_np') \ - .require(targetos == 'darwin' or libattr.found(), + .require(host_os == 'darwin' or libattr.found(), error_message: 'virtio-9p (virtfs) on Linux requires libattr-devel') \ .disable_auto_if(not have_tools and not have_system) \ .allowed() have_virtfs_proxy_helper = get_option('virtfs_proxy_helper') \ - .require(targetos != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \ + .require(host_os != 'darwin', error_message: 'the virtfs proxy helper is incompatible with macOS') \ .require(have_virtfs, error_message: 'the virtfs proxy helper requires that virtfs is enabled') \ .disable_auto_if(not have_tools) \ .require(libcap_ng.found(), error_message: 'the virtfs proxy helper requires libcap-ng') \ @@ -2110,12 +2110,12 @@ if enable_modules endif have_slirp_smbd = get_option('slirp_smbd') \ - .require(targetos != 'windows', error_message: 'Host smbd not supported on this platform.') \ + .require(host_os != 'windows', error_message: 'Host smbd not supported on this platform.') \ .allowed() if have_slirp_smbd smbd_path = get_option('smbd') if smbd_path == '' - smbd_path = (targetos == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd') + smbd_path = (host_os == 'sunos' ? '/usr/sfw/sbin/smbd' : '/usr/sbin/smbd') endif config_host_data.set_quoted('CONFIG_SMBD_COMMAND', smbd_path) endif @@ -2123,7 +2123,7 @@ endif config_host_data.set('HOST_' + host_arch.to_upper(), 1) kvm_targets_c = '""' -if get_option('kvm').allowed() and targetos == 'linux' +if get_option('kvm').allowed() and host_os == 'linux' kvm_targets_c = '"' + '" ,"'.join(kvm_targets) + '"' endif config_host_data.set('CONFIG_KVM_TARGETS', kvm_targets_c) @@ -2136,16 +2136,16 @@ config_host_data.set('CONFIG_MODULE_UPGRADES', get_option('module_upgrades')) config_host_data.set('CONFIG_ATTR', libattr.found()) config_host_data.set('CONFIG_BDRV_WHITELIST_TOOLS', get_option('block_drv_whitelist_in_tools')) config_host_data.set('CONFIG_BRLAPI', brlapi.found()) -config_host_data.set('CONFIG_BSD', targetos in bsd_oses) +config_host_data.set('CONFIG_BSD', host_os in bsd_oses) config_host_data.set('CONFIG_CAPSTONE', capstone.found()) config_host_data.set('CONFIG_COCOA', cocoa.found()) -config_host_data.set('CONFIG_DARWIN', targetos == 'darwin') +config_host_data.set('CONFIG_DARWIN', host_os == 'darwin') config_host_data.set('CONFIG_FUZZ', get_option('fuzzing')) config_host_data.set('CONFIG_GCOV', get_option('b_coverage')) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) -config_host_data.set('CONFIG_LINUX', targetos == 'linux') -config_host_data.set('CONFIG_POSIX', targetos != 'windows') -config_host_data.set('CONFIG_WIN32', targetos == 'windows') +config_host_data.set('CONFIG_LINUX', host_os == 'linux') +config_host_data.set('CONFIG_POSIX', host_os != 'windows') +config_host_data.set('CONFIG_WIN32', host_os == 'windows') config_host_data.set('CONFIG_LZO', lzo.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found()) config_host_data.set('CONFIG_BLKIO', blkio.found()) @@ -2203,7 +2203,7 @@ endif config_host_data.set('CONFIG_PIXMAN', pixman.found()) config_host_data.set('CONFIG_SLIRP', slirp.found()) config_host_data.set('CONFIG_SNAPPY', snappy.found()) -config_host_data.set('CONFIG_SOLARIS', targetos == 'sunos') +config_host_data.set('CONFIG_SOLARIS', host_os == 'sunos') if get_option('tcg').allowed() config_host_data.set('CONFIG_TCG', 1) config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch == 'tci') @@ -2304,7 +2304,7 @@ config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h')) config_host_data.set('HAVE_SYS_DISK_H', cc.has_header('sys/disk.h')) config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h')) config_host_data.set('HAVE_SYS_KCOV_H', cc.has_header('sys/kcov.h')) -if targetos == 'windows' +if host_os == 'windows' config_host_data.set('HAVE_AFUNIX_H', cc.has_header('afunix.h')) endif @@ -2686,7 +2686,7 @@ config_host_data.set('CONFIG_USBFS', have_linux_user and cc.compiles(''' int main(void) { return 0; }''')) have_keyring = get_option('keyring') \ - .require(targetos == 'linux', error_message: 'keyring is only available on Linux') \ + .require(host_os == 'linux', error_message: 'keyring is only available on Linux') \ .require(cc.compiles(''' #include #include @@ -2795,9 +2795,9 @@ endif if get_option('membarrier').disabled() have_membarrier = false -elif targetos == 'windows' +elif host_os == 'windows' have_membarrier = true -elif targetos == 'linux' +elif host_os == 'linux' have_membarrier = cc.compiles(''' #include #include @@ -2834,7 +2834,7 @@ config_host_data.set('CONFIG_AF_VSOCK', cc.has_header_symbol( have_vss = false have_vss_sdk = false # old xp/2003 SDK -if targetos == 'windows' and 'cpp' in all_languages +if host_os == 'windows' and 'cpp' in all_languages have_vss = cxx.compiles(''' #define __MIDL_user_allocate_free_DEFINED__ #include @@ -2845,7 +2845,7 @@ config_host_data.set('HAVE_VSS_SDK', have_vss_sdk) # Older versions of MinGW do not import _lock_file and _unlock_file properly. # This was fixed for v6.0.0 with commit b48e3ac8969d. -if targetos == 'windows' +if host_os == 'windows' config_host_data.set('HAVE__LOCK_FILE', cc.links(''' #include int main(void) { @@ -2855,7 +2855,7 @@ if targetos == 'windows' }''', name: '_lock_file and _unlock_file')) endif -if targetos == 'windows' +if host_os == 'windows' mingw_has_setjmp_longjmp = cc.links(''' #include int main(void) { @@ -2925,7 +2925,7 @@ host_kconfig = \ (have_vhost_vdpa ? ['CONFIG_VHOST_VDPA=y'] : []) + \ (have_vhost_kernel ? ['CONFIG_VHOST_KERNEL=y'] : []) + \ (have_virtfs ? ['CONFIG_VIRTFS=y'] : []) + \ - (targetos == 'linux' ? ['CONFIG_LINUX=y'] : []) + \ + (host_os == 'linux' ? ['CONFIG_LINUX=y'] : []) + \ (have_pvrdma ? ['CONFIG_PVRDMA=y'] : []) + \ (multiprocess_allowed ? ['CONFIG_MULTIPROCESS_ALLOWED=y'] : []) + \ (vfio_user_server_allowed ? ['CONFIG_VFIO_USER_SERVER_ALLOWED=y'] : []) + \ @@ -2939,7 +2939,7 @@ fdt_required = [] foreach target : target_dirs config_target = { 'TARGET_NAME': target.split('-')[0] } if target.endswith('linux-user') - if targetos != 'linux' + if host_os != 'linux' if default_targets continue endif @@ -2947,7 +2947,7 @@ foreach target : target_dirs endif config_target += { 'CONFIG_LINUX_USER': 'y' } elif target.endswith('bsd-user') - if targetos not in bsd_oses + if host_os not in bsd_oses if default_targets continue endif @@ -3128,7 +3128,7 @@ endif config_host_data.set('CONFIG_FDT', fdt.found()) vhost_user = not_found -if targetos == 'linux' and have_vhost_user +if host_os == 'linux' and have_vhost_user libvhost_user = subproject('libvhost-user') vhost_user = libvhost_user.get_variable('vhost_user_dep') endif @@ -3452,7 +3452,7 @@ if have_block # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, # os-win32.c does not - if targetos == 'windows' + if host_os == 'windows' system_ss.add(files('os-win32.c')) else blockdev_ss.add(files('os-posix.c')) @@ -3740,7 +3740,7 @@ common_all = static_library('common', feature_to_c = find_program('scripts/feature_to_c.py') -if targetos == 'darwin' +if host_os == 'darwin' entitlement = find_program('scripts/entitlement.sh') endif @@ -3757,7 +3757,7 @@ foreach target : target_dirs link_args = emulator_link_args target_inc = [include_directories('target' / config_target['TARGET_BASE_ARCH'])] - if targetos == 'linux' + if host_os == 'linux' target_inc += include_directories('linux-headers', is_system: true) endif if target.endswith('-softmmu') @@ -3787,7 +3787,7 @@ foreach target : target_dirs endif if 'CONFIG_BSD_USER' in config_target base_dir = 'bsd-user' - target_inc += include_directories('bsd-user/' / targetos) + target_inc += include_directories('bsd-user/' / host_os) target_inc += include_directories('bsd-user/host/' / host_arch) dir = base_dir / abi arch_srcs += files(dir / 'signal.c', dir / 'target_arch_cpu.c') @@ -3844,7 +3844,7 @@ foreach target : target_dirs 'sources': files('system/main.c'), 'dependencies': [] }] - if targetos == 'windows' and (sdl.found() or gtk.found()) + if host_os == 'windows' and (sdl.found() or gtk.found()) execs += [{ 'name': 'qemu-system-' + target_name + 'w', 'win_subsystem': 'windows', @@ -3871,7 +3871,7 @@ foreach target : target_dirs endif foreach exe: execs exe_name = exe['name'] - if targetos == 'darwin' + if host_os == 'darwin' exe_name += '-unsigned' endif @@ -3884,7 +3884,7 @@ foreach target : target_dirs link_args: link_args, win_subsystem: exe['win_subsystem']) - if targetos == 'darwin' + if host_os == 'darwin' icon = 'pc-bios/qemu.rsrc' build_input = [emulator, files(icon)] install_input = [ @@ -3940,7 +3940,7 @@ endforeach if get_option('plugins') install_headers('include/qemu/qemu-plugin.h') - if targetos == 'windows' + if host_os == 'windows' # On windows, we want to deliver the qemu_plugin_api.lib file in the qemu installer, # so that plugin authors can compile against it. install_data(win32_qemu_plugin_api_lib, install_dir: 'lib') @@ -3981,7 +3981,7 @@ if have_tools subdir('contrib/vhost-user-scsi') endif - if targetos == 'linux' + if host_os == 'linux' executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), dependencies: [qemuutil, libcap_ng], install: true, @@ -4048,7 +4048,7 @@ summary(summary_info, bool_yn: true, section: 'Build environment') # Directories summary_info += {'Install prefix': get_option('prefix')} summary_info += {'BIOS directory': qemu_datadir} -pathsep = targetos == 'windows' ? ';' : ':' +pathsep = host_os == 'windows' ? ';' : ':' summary_info += {'firmware path': pathsep.join(get_option('qemu_firmwarepath'))} summary_info += {'binary directory': get_option('prefix') / get_option('bindir')} summary_info += {'library directory': get_option('prefix') / get_option('libdir')} @@ -4056,7 +4056,7 @@ summary_info += {'module directory': qemu_moddir} summary_info += {'libexec directory': get_option('prefix') / get_option('libexecdir')} summary_info += {'include directory': get_option('prefix') / get_option('includedir')} summary_info += {'config directory': get_option('prefix') / get_option('sysconfdir')} -if targetos != 'windows' +if host_os != 'windows' summary_info += {'local state directory': get_option('prefix') / get_option('localstatedir')} summary_info += {'Manual directory': get_option('prefix') / get_option('mandir')} else @@ -4079,7 +4079,7 @@ if config_host.has_key('GDB') endif summary_info += {'iasl': iasl} summary_info += {'genisoimage': config_host['GENISOIMAGE']} -if targetos == 'windows' and have_ga +if host_os == 'windows' and have_ga summary_info += {'wixl': wixl} endif if slirp.found() and have_system @@ -4177,7 +4177,7 @@ if get_option('cfi') endif summary_info += {'strip binaries': get_option('strip')} summary_info += {'sparse': sparse} -summary_info += {'mingw32 support': targetos == 'windows'} +summary_info += {'mingw32 support': host_os == 'windows'} summary(summary_info, bool_yn: true, section: 'Compilation') # snarf the cross-compilation information for tests @@ -4276,7 +4276,7 @@ summary(summary_info, bool_yn: true, section: 'Crypto') # UI summary_info = {} -if targetos == 'darwin' +if host_os == 'darwin' summary_info += {'Cocoa support': cocoa} endif summary_info += {'SDL support': sdl} @@ -4300,15 +4300,15 @@ summary(summary_info, bool_yn: true, section: 'User interface') # Audio backends summary_info = {} -if targetos not in ['darwin', 'haiku', 'windows'] +if host_os not in ['darwin', 'haiku', 'windows'] summary_info += {'OSS support': oss} summary_info += {'sndio support': sndio} -elif targetos == 'darwin' +elif host_os == 'darwin' summary_info += {'CoreAudio support': coreaudio} -elif targetos == 'windows' +elif host_os == 'windows' summary_info += {'DirectSound support': dsound} endif -if targetos == 'linux' +if host_os == 'linux' summary_info += {'ALSA support': alsa} summary_info += {'PulseAudio support': pulse} endif @@ -4318,7 +4318,7 @@ summary(summary_info, bool_yn: true, section: 'Audio backends') # Network backends summary_info = {} -if targetos == 'darwin' +if host_os == 'darwin' summary_info += {'vmnet.framework support': vmnet} endif summary_info += {'AF_XDP support': libxdp} @@ -4355,7 +4355,7 @@ summary_info += {'OpenGL support (epoxy)': opengl} summary_info += {'GBM': gbm} summary_info += {'libiscsi support': libiscsi} summary_info += {'libnfs support': libnfs} -if targetos == 'windows' +if host_os == 'windows' if have_ga summary_info += {'QGA VSS support': have_qga_vss} endif @@ -4397,20 +4397,20 @@ if host_arch == 'unknown' endif endif -if not supported_oses.contains(targetos) +if not supported_oses.contains(host_os) message() warning('UNSUPPORTED HOST OS') message() - message('Support for host OS ' + targetos + 'is not currently maintained.') + message('Support for host OS ' + host_os + 'is not currently maintained.') message('configure has succeeded and you can continue to build, but') message('the QEMU project does not guarantee that QEMU will compile or') message('work on this operating system. You can help by volunteering') message('to maintain it and providing a build host for our continuous') message('integration setup. This will ensure that future versions of QEMU') - message('will keep working on ' + targetos + '.') + message('will keep working on ' + host_os + '.') endif -if host_arch == 'unknown' or not supported_oses.contains(targetos) +if host_arch == 'unknown' or not supported_oses.contains(host_os) message() message('If you want to help supporting QEMU on this platform, please') message('contact the developers at qemu-devel@nongnu.org.') @@ -4424,8 +4424,8 @@ if get_option('relocatable') and \ warning('bindir not included within prefix, the installation will not be relocatable.') actually_reloc = false endif -if not actually_reloc and (targetos == 'windows' or get_option('relocatable')) - if targetos == 'windows' +if not actually_reloc and (host_os == 'windows' or get_option('relocatable')) + if host_os == 'windows' message() warning('Windows installs should usually be relocatable.') endif diff --git a/net/can/meson.build b/net/can/meson.build index bdf6f8eee16..af3b27921cd 100644 --- a/net/can/meson.build +++ b/net/can/meson.build @@ -1,6 +1,6 @@ can_ss = ss.source_set() can_ss.add(files('can_core.c', 'can_host.c')) -if targetos == 'linux' +if host_os == 'linux' can_ss.add(files('can_socketcan.c')) endif diff --git a/net/meson.build b/net/meson.build index a53f18ad7b4..9432a588e4e 100644 --- a/net/meson.build +++ b/net/meson.build @@ -43,13 +43,13 @@ if have_vhost_net_user system_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-user.c'), if_false: files('vhost-user-stub.c')) endif -if targetos == 'windows' +if host_os == 'windows' system_ss.add(files('tap-win32.c')) -elif targetos == 'linux' +elif host_os == 'linux' system_ss.add(files('tap.c', 'tap-linux.c')) -elif targetos in bsd_oses +elif host_os in bsd_oses system_ss.add(files('tap.c', 'tap-bsd.c')) -elif targetos == 'sunos' +elif host_os == 'sunos' system_ss.add(files('tap.c', 'tap-solaris.c')) else system_ss.add(files('tap.c', 'tap-stub.c')) diff --git a/plugins/meson.build b/plugins/meson.build index 6b2d7a92926..51b4350c2a0 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,7 +1,7 @@ plugin_ldflags = [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules - if targetos == 'darwin' + if host_os == 'darwin' configure_file( input: files('qemu-plugins.symbols'), output: 'qemu-plugins-ld64.symbols', @@ -14,7 +14,7 @@ if not enable_modules endif if get_option('plugins') - if targetos == 'windows' + if host_os == 'windows' dlltool = find_program('dlltool', required: true) # Generate a .lib file for plugins to link against. diff --git a/qga/meson.build b/qga/meson.build index 66c0f1e56f8..1c3d2a3d1b7 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -7,7 +7,7 @@ if not have_ga endif have_qga_vss = get_option('qga_vss') \ - .require(targetos == 'windows', + .require(host_os == 'windows', error_message: 'VSS support requires Windows') \ .require('cpp' in all_languages, error_message: 'VSS support requires a C++ compiler') \ @@ -67,7 +67,7 @@ qga_ss.add(files( 'main.c', 'cutils.c', )) -if targetos == 'windows' +if host_os == 'windows' qga_ss.add(files( 'channel-win32.c', 'commands-win32.c', @@ -80,9 +80,9 @@ else 'commands-posix.c', 'commands-posix-ssh.c', )) - if targetos == 'linux' + if host_os == 'linux' qga_ss.add(files('commands-linux.c')) - elif targetos in bsd_oses + elif host_os in bsd_oses qga_ss.add(files('commands-bsd.c')) endif endif @@ -91,7 +91,7 @@ qga_ss = qga_ss.apply({}) gen_tlb = [] qga_libs = [] -if targetos == 'windows' +if host_os == 'windows' qga_libs += ['-lws2_32', '-lwinmm', '-lpowrprof', '-lwtsapi32', '-lwininet', '-liphlpapi', '-lnetapi32', '-lsetupapi', '-lcfgmgr32'] if have_qga_vss @@ -101,7 +101,7 @@ if targetos == 'windows' endif qga_objs = [] -if targetos == 'windows' +if host_os == 'windows' windmc = find_program('windmc', required: true) windres = find_program('windres', required: true) @@ -123,7 +123,7 @@ qga = executable('qemu-ga', qga_ss.sources() + qga_objs, install: true) all_qga += qga -if targetos == 'windows' +if host_os == 'windows' qemu_ga_msi_arch = { 'x86': ['-D', 'Arch=32'], 'x86_64': ['-a', 'x64', '-D', 'Arch=64'] @@ -185,7 +185,7 @@ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) # the leak detector in build-oss-fuzz Gitlab CI test. we should re-enable # this when an alternative is implemented or when the underlying glib # issue is identified/fix -#if targetos != 'windows' +#if host_os != 'windows' if false srcs = [files('commands-posix-ssh.c')] i = 0 diff --git a/scsi/meson.build b/scsi/meson.build index 0ff2b3affe0..cdb91e11b0e 100644 --- a/scsi/meson.build +++ b/scsi/meson.build @@ -1,5 +1,5 @@ block_ss.add(files('utils.c')) -if targetos == 'linux' +if host_os == 'linux' block_ss.add(files('pr-manager.c', 'pr-manager-helper.c')) else block_ss.add(files('pr-manager-stub.c')) diff --git a/system/meson.build b/system/meson.build index 0632a3daa8a..25e21172505 100644 --- a/system/meson.build +++ b/system/meson.build @@ -33,6 +33,6 @@ endif system_ss.add(when: seccomp, if_true: files('qemu-seccomp.c')) system_ss.add(when: fdt, if_true: files('device_tree.c')) -if targetos == 'linux' - system_ss.add('async-teardown.c') +if host_os == 'linux' + system_ss.add(files('async-teardown.c')) endif diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 9ef322afc42..4ab89aaa960 100644 --- a/tests/fp/meson.build +++ b/tests/fp/meson.build @@ -3,7 +3,7 @@ if 'CONFIG_TCG' not in config_all_accel endif # There are namespace pollution issues on Windows, due to osdep.h # bringing in Windows headers that define a FLOAT128 type. -if targetos == 'windows' +if host_os == 'windows' subdir_done() endif diff --git a/tests/meson.build b/tests/meson.build index 32cc15a3ef7..0a6f96f8f84 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -68,7 +68,7 @@ test_deps = { 'test-qht-par': qht_bench, } -if have_tools and have_vhost_user and targetos == 'linux' +if have_tools and have_vhost_user and host_os == 'linux' executable('vhost-user-bridge', sources: files('vhost-user-bridge.c'), dependencies: [qemuutil, vhost_user]) diff --git a/tests/plugin/meson.build b/tests/plugin/meson.build index 28a929dbcc0..e18183aaeda 100644 --- a/tests/plugin/meson.build +++ b/tests/plugin/meson.build @@ -1,7 +1,7 @@ t = [] if get_option('plugins') foreach i : ['bb', 'empty', 'insn', 'mem', 'syscall'] - if targetos == 'windows' + if host_os == 'windows' t += shared_module(i, files(i + '.c') + '../../contrib/plugins/win32_linker.c', include_directories: '../../include/qemu', link_depends: [win32_qemu_plugin_api_lib], diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build index 53847cb98fc..fad340ad595 100644 --- a/tests/qemu-iotests/meson.build +++ b/tests/qemu-iotests/meson.build @@ -1,4 +1,4 @@ -if not have_tools or targetos == 'windows' +if not have_tools or host_os == 'windows' subdir_done() endif diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 565eff4c0a2..f25bffcc20a 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -38,8 +38,8 @@ qtests_cxl = \ # for the availability of the default NICs in the tests qtests_filter = \ (get_option('default_devices') and slirp.found() ? ['test-netfilter'] : []) + \ - (get_option('default_devices') and targetos != 'windows' ? ['test-filter-mirror'] : []) + \ - (get_option('default_devices') and targetos != 'windows' ? ['test-filter-redirector'] : []) + (get_option('default_devices') and host_os != 'windows' ? ['test-filter-mirror'] : []) + \ + (get_option('default_devices') and host_os != 'windows' ? ['test-filter-redirector'] : []) qtests_i386 = \ (slirp.found() ? ['pxe-test'] : []) + \ @@ -48,7 +48,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \ (config_all_devices.has_key('CONFIG_SGA') ? ['boot-serial-test'] : []) + \ (config_all_devices.has_key('CONFIG_ISA_IPMI_KCS') ? ['ipmi-kcs-test'] : []) + \ - (targetos == 'linux' and \ + (host_os == 'linux' and \ config_all_devices.has_key('CONFIG_ISA_IPMI_BT') and config_all_devices.has_key('CONFIG_IPMI_EXTERN') ? ['ipmi-bt-test'] : []) + \ (config_all_devices.has_key('CONFIG_WDT_IB700') ? ['wdt_ib700-test'] : []) + \ @@ -74,7 +74,7 @@ qtests_i386 = \ (config_all_devices.has_key('CONFIG_SB16') ? ['fuzz-sb16-test'] : []) + \ (config_all_devices.has_key('CONFIG_SDHCI_PCI') ? ['fuzz-sdcard-test'] : []) + \ (config_all_devices.has_key('CONFIG_ESP_PCI') ? ['am53c974-test'] : []) + \ - (targetos != 'windows' and \ + (host_os != 'windows' and \ config_all_devices.has_key('CONFIG_ACPI_ERST') ? ['erst-test'] : []) + \ (config_all_devices.has_key('CONFIG_PCIE_PORT') and \ config_all_devices.has_key('CONFIG_VIRTIO_NET') and \ @@ -277,7 +277,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') qos_test_ss.add(files('virtio-serial-test.c')) endif -if targetos != 'windows' +if host_os != 'windows' qos_test_ss.add(files('e1000e-test.c')) endif if have_virtfs diff --git a/tests/unit/meson.build b/tests/unit/meson.build index a05d4710904..69f9c050504 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -100,7 +100,7 @@ if have_block } if gnutls.found() and \ tasn1.found() and \ - targetos != 'windows' + host_os != 'windows' tests += { 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1_tab.c', tasn1, crypto, gnutls], @@ -115,7 +115,7 @@ if have_block if xts == 'private' tests += {'test-crypto-xts': [crypto, io]} endif - if targetos != 'windows' + if host_os != 'windows' tests += { 'test-image-locking': [testblock], 'test-nested-aio-poll': [testblock], @@ -150,7 +150,7 @@ if have_system # are not runnable under TSan due to a known issue. # https://github.com/google/sanitizers/issues/1116 if not get_option('tsan') - if targetos != 'windows' + if host_os != 'windows' tests += { 'test-char': ['socket-helpers.c', qom, io, chardev] } @@ -162,7 +162,7 @@ if have_system endif endif -if have_ga and targetos == 'linux' +if have_ga and host_os == 'linux' tests += {'test-qga': ['../qtest/libqmp.c']} test_deps += {'test-qga': qga} endif diff --git a/ui/dbus-display1.xml b/ui/dbus-display1.xml index f0e2fac2127..ce35d64eea1 100644 --- a/ui/dbus-display1.xml +++ b/ui/dbus-display1.xml @@ -71,7 +71,7 @@ :dbus:iface:`org.qemu.Display1.Listener` interface. --> - + @@ -370,7 +370,7 @@ - + - + @@ -715,7 +715,7 @@ :dbus:iface:`org.qemu.Display1.AudioInListener` interface. --> - + @@ -976,7 +976,7 @@ The current handler, if any, will be replaced. --> - + diff --git a/ui/meson.build b/ui/meson.build index a370494c4ab..376e0d771ba 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -25,7 +25,7 @@ endif system_ss.add([spice_headers, files('spice-module.c')]) system_ss.add(when: spice_protocol, if_true: files('vdagent.c')) -if targetos == 'linux' +if host_os == 'linux' system_ss.add(files('input-linux.c', 'udmabuf.c')) endif system_ss.add(when: cocoa, if_true: files('cocoa.m')) @@ -75,7 +75,7 @@ endif if dbus_display dbus_ss = ss.source_set() env = environment() - env.set('TARGETOS', targetos) + env.set('HOST_OS', host_os) xml = custom_target('dbus-display preprocess', input: 'dbus-display1.xml', output: 'dbus-display1.xml', @@ -105,7 +105,7 @@ if dbus_display endif if gtk.found() - if targetos == 'windows' + if host_os == 'windows' system_ss.add(files('win32-kbd-hook.c')) endif @@ -121,7 +121,7 @@ if gtk.found() endif if sdl.found() - if targetos == 'windows' + if host_os == 'windows' system_ss.add(files('win32-kbd-hook.c')) endif diff --git a/util/meson.build b/util/meson.build index 4e970d2b488..af3bf5692d8 100644 --- a/util/meson.build +++ b/util/meson.build @@ -3,7 +3,7 @@ util_ss.add(files('thread-context.c'), numa) if not config_host_data.get('CONFIG_ATOMIC64') util_ss.add(files('atomic64.c')) endif -if targetos != 'windows' +if host_os != 'windows' util_ss.add(files('aio-posix.c')) util_ss.add(files('fdmon-poll.c')) if config_host_data.get('CONFIG_EPOLL_CREATE1') @@ -13,7 +13,7 @@ if targetos != 'windows' util_ss.add(files('event_notifier-posix.c')) util_ss.add(files('mmap-alloc.c')) freebsd_dep = [] - if targetos == 'freebsd' + if host_os == 'freebsd' freebsd_dep = util endif util_ss.add(files('oslib-posix.c'), freebsd_dep) @@ -73,7 +73,7 @@ endif if have_system util_ss.add(files('crc-ccitt.c')) util_ss.add(when: gio, if_true: files('dbus.c')) - if targetos == 'linux' + if host_os == 'linux' util_ss.add(files('userfaultfd.c')) endif endif @@ -108,7 +108,7 @@ if have_block else util_ss.add(files('filemonitor-stub.c')) endif - if targetos == 'linux' + if host_os == 'linux' util_ss.add(files('vhost-user-server.c'), vhost_user) util_ss.add(files('vfio-helpers.c')) util_ss.add(files('chardev_open.c'))