From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659967; cv=none; d=zohomail.com; s=zohoarc; b=kSRMwVl0qB7bzO0q5f2PIl+vb7GjxCXfoP0Ucly2+wQoTMpSqYELmHrR/bN1yaZIJJudNS1ZWCUAYVGNicWNmWhiKA88lnWmhnRA4D5Q4js97a82uLZLXkL8IjA6/21uZDtUmCBkgC8v6ECz8lmMP9o4X6czf7dfoudttX4QWVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659967; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=MjIkCF5qgOZQn7olwlUoun7cKywGIXhs+Hi0nn+kw18=; b=RIhWEiyCuMRHV4aDjIVCMmi3UF51HCs1kU/5Ox+nZA1QF8s0UfzEh1nGsdxjNrq9gW1gxtn+yV7vR5oIHuDE9Ic8VWlvhujZBmQyqbmuqfBhMSIMDSuj1Bzo4gZKLzTcDMtxcLKTaNaJl1RTBN64J4qIJpRou2/U+qfIMEMurTs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659967145335.4595201644835; Sat, 2 Sep 2023 06:06:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQE7-0000vR-Sq; Sat, 02 Sep 2023 08:59:47 -0400 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 1qcQE6-0000tp-8J for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:46 -0400 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 1qcQE3-0001fg-LB for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:46 -0400 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-618-IXQ61ynjMqCPKMhuFITvhQ-1; Sat, 02 Sep 2023 08:59:40 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-31c7b8d0f0aso1658075f8f.3 for ; Sat, 02 Sep 2023 05:59:40 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l4-20020a5d4804000000b0031c56218984sm8397074wrq.104.2023.09.02.05.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659582; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MjIkCF5qgOZQn7olwlUoun7cKywGIXhs+Hi0nn+kw18=; b=Y0x5YzgiXGPESld+eFhRyPeo1GSMET9+WxWqNFm8i04+12SRZY9Loge6/hTiSR+FWy6QTG FoTAQfOURwNzL2CCK4YjxxLoai5zW4SBqmnvRbWMOkgyKUwBlyvfJ75XcdVHmOm3kEWFvP K9SEkWFzbABpRpPWCaLImsd0n7crGkU= X-MC-Unique: IXQ61ynjMqCPKMhuFITvhQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659578; x=1694264378; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MjIkCF5qgOZQn7olwlUoun7cKywGIXhs+Hi0nn+kw18=; b=UKSQERkYct6jwGV8MBcR/EEedh7pFdyTP3drrIERehUlA4HC0QKUHLqIU9EdSVMZRW Bws0yP/1jVmJaX6cAu0EoQSrjBKxS4ejYxbV9ru9fMjoGyOjQ4Z/0a5V+ZpOFTv4LGvw cJfdsSPvBTmTbekUrWnSBQA3hAr9qEE9VDb0JkIi5wX1MGMwhAsAd/Q1zjJgKMBgVEuK 9HfwwXlzjDT/3yXF9uw58Q3LMG080PWAgO3H3iC1ImwVFE7S27Z2jnOaDhrtOO55okwW yHg2HfcAbx93TcNDARYxYL/DuUGawWhTPD+K2zlKcvmMxTVESBOHzPcpo1/i8dYVQnSh qFkQ== X-Gm-Message-State: AOJu0YwFPHauWFWS12kaEvX+2F54+EVvh0x3X283Awt9BD73sB2b1UX5 OevHnMafPqttWV7YqNlmHvCKz6t6luQpFdsC5+6Sr4jO66Jp2DkN8BtjUz8mdlQtInUeZ1d5TZB YBZtJjsbbvQ0xGstQGnPZfDK+5vN+8mmFNd2aZlHiPpktyvKvgiUA9uR4jTA9MhVoqzIuufbXjQ c= X-Received: by 2002:a5d:4006:0:b0:319:8ce0:4e52 with SMTP id n6-20020a5d4006000000b003198ce04e52mr3492471wrp.67.1693659578330; Sat, 02 Sep 2023 05:59:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDIev9tUbck2JA/7llBa0UwGsJRlWHlbKIN7tD+Q59Iq8oILMvhcca0aOsGTDR55ZLpue+hg== X-Received: by 2002:a5d:4006:0:b0:319:8ce0:4e52 with SMTP id n6-20020a5d4006000000b003198ce04e52mr3492462wrp.67.1693659577920; Sat, 02 Sep 2023 05:59:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 01/15] meson: do not unnecessarily use cmake for dependencies Date: Sat, 2 Sep 2023 14:59:20 +0200 Message-ID: <20230902125934.113017-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659967812100001 Both gvnc and sysprof-capture come with pkg-config files, so specify the method to find them. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- tests/migration/meson.build | 2 +- tests/qtest/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/migration/meson.build b/tests/migration/meson.build index ac71f132901..a91aa61c659 100644 --- a/tests/migration/meson.build +++ b/tests/migration/meson.build @@ -1,4 +1,4 @@ -sysprof =3D dependency('sysprof-capture-4', required: false) +sysprof =3D dependency('sysprof-capture-4', method: 'pkg-config', required= : false) glib_static =3D dependency('glib-2.0', version: glib_req_ver, required: fa= lse, method: 'pkg-config', static: true) =20 diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index b071d400b37..df63909ee51 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -321,7 +321,7 @@ qtests =3D { } =20 if vnc.found() - gvnc =3D dependency('gvnc-1.0', required: false) + gvnc =3D dependency('gvnc-1.0', method: 'pkg-config', required: false) if gvnc.found() qtests +=3D {'vnc-display-test': [gvnc]} qtests_generic +=3D [ 'vnc-display-test' ] --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659705; cv=none; d=zohomail.com; s=zohoarc; b=U1nhOL8u0dsCaHZp6K8yLsCk5QShsa3zTwXa93vc+0WaLNOgSf8+0KOwLjG1mrKVGD7VkEUmwxs2kG/tJgCflcuUlXElItxHeHfj7wIbtgVFNr2SHJYKdybyMitbofPC+TT93AighAoA8u4fsarBjWZqqXQjiY+UkS4JvxxwW6o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659705; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=nqCLzWC5Te9PQ+uHTLXN6umOZS02O1C9B8XH1Qm66mo=; b=Ff6jYzP1OZkTSGvBM8erETibXZEaL+Liqd/uAWXqllupq2ILARikAbZ1mgWHq8ZD9qwg22irdXfAvyxMSJ3XToPUhICBUQ6HWvcsbY+nxUkyjQ6beXO5CXwp0gDZlcYZKALY9g4FuSMQ2cSkOuBx24M5+v9trB9gh7glKJ5o/F0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659705385275.07164393979815; Sat, 2 Sep 2023 06:01:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQE9-0000w8-NH; Sat, 02 Sep 2023 08:59:49 -0400 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 1qcQE8-0000vZ-8r for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:48 -0400 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 1qcQE6-0001g9-0b for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:48 -0400 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-620-vivoJQk5NVW0rR8UWSEQCw-1; Sat, 02 Sep 2023 08:59:42 -0400 Received: by mail-lf1-f72.google.com with SMTP id 2adb3069b0e04-500a9156daaso10973e87.0 for ; Sat, 02 Sep 2023 05:59:42 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id 17-20020a05600c249100b003fbc30825fbsm7823128wms.39.2023.09.02.05.59.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659585; 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=nqCLzWC5Te9PQ+uHTLXN6umOZS02O1C9B8XH1Qm66mo=; b=OvyWP1Q/u5XuSmLWAsqbqw1blNsoljSDr6hHrC0r1YTiLLK2E0QNQ1YxRw/G3wwFHDi5Xh rcv8wdw9KuSqvgDUOcNuSeJL8duCmDToRiQ5fmam5mWYycLpXrETa9ZAmwyp+I2+70ZRfk JTsVux6LZ0sQoPyTIMvvIrSb2c9vWZc= X-MC-Unique: vivoJQk5NVW0rR8UWSEQCw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659581; x=1694264381; 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=nqCLzWC5Te9PQ+uHTLXN6umOZS02O1C9B8XH1Qm66mo=; b=fEH01hCno8OIdZVRjEKtEbthryAC4OI/goKTds7ftaAy/UpM0/v1+R3lC8lY1gQHIs Kf5CH6w/8YvNTCtv5FdVgwI+89pqzG8vrIuJAiarKpskKFQoE0qn/gIB8VxEPkZ28mzg v1XaE8UXKdpg46gn6jH9CM1ACMvk85MZU9N1RSFWx2nzvuTOuz4Yhr4Y1q4Poth0EJgw 76f4wNJbBH1o0UlcMp3rcI+l8fWjcJ4mAIR8r808tkaW0npuc6KdcFxFWGQIteT/7HHw Akl3OovwAxuOuE05eDFaHD9uqEpK1/vxMoS2OTIqnnMmP1a8r2gwHq2LtwZdDVuNFHnj 4rcw== X-Gm-Message-State: AOJu0YxePvX1ZlWTvbpEXFGfwR0cYGEEYhL+HpYYDrlAxuhKwNtn1sXW /ZqkYCchX/rzBXXV3v9k/P93XQcKf/PJRITaRKHrlqjxATiFMOuh+a9YABRwytanAq4GwrYaR88 Xnk9A6TiO1ISospFrCv3Xxc+Q2JVPIux9hTK+ugP8TPz2grlrXVp6ynqiOnEYsH1OirWJVPcPTS U= X-Received: by 2002:a05:6512:3194:b0:500:b96a:6f59 with SMTP id i20-20020a056512319400b00500b96a6f59mr4307657lfe.56.1693659580829; Sat, 02 Sep 2023 05:59:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUh1GKfebFSh8M1iznBUa210lpaB/QSB4vVAIum1BA9Gkx5fXol3rs4prlg6bUXcNfaurAeg== X-Received: by 2002:a05:6512:3194:b0:500:b96a:6f59 with SMTP id i20-20020a056512319400b00500b96a6f59mr4307644lfe.56.1693659580326; Sat, 02 Sep 2023 05:59:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/15] meson: update unsupported host/CPU messages Date: Sat, 2 Sep 2023 14:59:21 +0200 Message-ID: <20230902125934.113017-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659706403100001 Content-Type: text/plain; charset="utf-8" Unsupported CPU and OSes are not really going away, but the project simply does not guarantee that they work. Rephrase the messages accordingly. While at it, move the warning for TCI performance at the end where it is more visible. Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- meson.build | 45 ++++++++++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/meson.build b/meson.build index 98e68ef0b1e..9bcf117f8a4 100644 --- a/meson.build +++ b/meson.build @@ -678,9 +678,7 @@ endif tcg_arch =3D host_arch if get_option('tcg').allowed() if host_arch =3D=3D 'unknown' - if get_option('tcg_interpreter') - warning('Unsupported CPU @0@, will use TCG with TCI (slow)'.format(c= pu)) - else + if not get_option('tcg_interpreter') error('Unsupported CPU @0@, try --enable-tcg-interpreter'.format(cpu= )) endif elif get_option('tcg_interpreter') @@ -4317,28 +4315,37 @@ summary_info +=3D {'selinux': selinux} summary_info +=3D {'libdw': libdw} summary(summary_info, bool_yn: true, section: 'Dependencies') =20 -if not supported_cpus.contains(cpu) +if host_arch =3D=3D 'unknown' message() - warning('SUPPORT FOR THIS HOST CPU WILL GO AWAY IN FUTURE RELEASES!') + warning('UNSUPPORTED HOST CPU') message() - message('CPU host architecture ' + cpu + ' support is not currently main= tained.') - message('The QEMU project intends to remove support for this host CPU in= ') - message('a future release if nobody volunteers to maintain it and to') - message('provide a build host for our continuous integration setup.') - message('configure has succeeded and you can continue to build, but') - message('if you care about QEMU on this platform you should contact') - message('us upstream at qemu-devel@nongnu.org.') + message('Support for CPU host architecture ' + cpu + ' is not currently') + message('maintained. The QEMU project does not guarantee that QEMU will') + message('compile or work on this host CPU. You can help by volunteering') + message('to maintain it and providing a build host for our continuous.') + message('integration setup.') + if get_option('tcg').allowed() and target_dirs.length() > 0 + message() + message('configure has succeeded and you can continue to build, but') + message('QEMU will use a slow interpreter to emulate the target CPU.') + endif endif =20 if not supported_oses.contains(targetos) message() - warning('WARNING: SUPPORT FOR THIS HOST OS WILL GO AWAY IN FUTURE RELEAS= ES!') + warning('UNSUPPORTED HOST OS') message() - message('Host OS ' + targetos + 'support is not currently maintained.') - message('The QEMU project intends to remove support for this host OS in') - message('a future release if nobody volunteers to maintain it and to') - message('provide a build host for our continuous integration setup.') + message('Support for host OS ' + targetos + 'is not currently maintained= .') message('configure has succeeded and you can continue to build, but') - message('if you care about QEMU on this platform you should contact') - message('us upstream at qemu-devel@nongnu.org.') + 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 QEM= U') + message('will keep working on ' + targetos + '.') +endif + +if host_arch =3D=3D 'unknown' or not supported_oses.contains(targetos) + message() + message('If you care about QEMU on this platform, please contact the') + message('developers at qemu-devel@nongnu.org.') endif --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659952; cv=none; d=zohomail.com; s=zohoarc; b=fHnk++72StOgsGChhecur3YV/0V0rn26G1QOxic34bgK56aAMFrc7oNr6zScPe+ZseLpZ6azOud7G/qGpmx/zzbeB6aPdwIOt82hbdNuEyCXuHbQjt7tuwmtvkBiXp95mn+XlUhbS0e+h73KCEaayUQFWbgDAHYepvg5NMMj4zM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659952; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=p/UaO2tdvyoA4JIJQgWAGmd+D1MVsgHmpLvvBwYxVwg=; b=mFwyJjTVmaZNPPS7wPg9dYcf0g1IrG6jCccHEmWocy3JFy+AiVtqgaBUY31l6zrsOQo2JfVBgGCXgL8XkUlvPz3kBUNbh5U3LbkkiQS9+vCtrF+A1JAtpMAgTzmeXpL9/VJH9GBo5CSTRcaYpPUugl2HSta6GTmJ3gKoCnONDy4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659952753586.9222718183153; Sat, 2 Sep 2023 06:05:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEA-0000ws-Bo; Sat, 02 Sep 2023 08:59:50 -0400 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 1qcQE9-0000vw-2U for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:49 -0400 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 1qcQE6-0001gI-TY for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:48 -0400 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-661-QYdaXeePNw6aDw9KUdSc8g-1; Sat, 02 Sep 2023 08:59:44 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-31c6c275c83so1689868f8f.2 for ; Sat, 02 Sep 2023 05:59:44 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bt12-20020a056000080c00b0031433443265sm2680062wrb.53.2023.09.02.05.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=p/UaO2tdvyoA4JIJQgWAGmd+D1MVsgHmpLvvBwYxVwg=; b=ZNMZU8cbVWT3ThBpTPJAizW+0J63yU9BqU7fZLmuNpDtGsU0pl4QKXNi7GX9+6c/MujAzl Y8x18/ZrDpXy/NmVtEDRtSRAxnCXEUxTcPb+Df1VybWa5ih9VnKKYe4BTzZW1fFaMbREl6 knGHVEVsC/07b/i3uQ/dL9CRnMTqHkw= X-MC-Unique: QYdaXeePNw6aDw9KUdSc8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659582; x=1694264382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p/UaO2tdvyoA4JIJQgWAGmd+D1MVsgHmpLvvBwYxVwg=; b=cKT1Uiz8FvfbSJuWQXBxAGlUL3kg/BlHNh0ikmS9BjC3Yl8yDNg9++n7JpDzsXrpES Oxn28RXm8i8h6Be0DE1kohR4se86HipJiYYZCgN9y4HC1LQp+CIXjXT5vtqUuLyEX40Z laypiL1pMILnIW1424W+mT2aa3SwAWxW8ti+r1dOXBzW8DhDTQGuDvXztkWo7hztZ3cM w7aGD4VxWdwIjZ+oiusAB0jPE6rKYnbBLnfnKBebnfoX0eYljkxZa9dUpKIx6O+VepCI pYeq0/d2ZB8LgQs7MIqgcjkt7T3dNjGF/1/nl+Om9LPn6zoMwqEv+JDZ9zae9L6EzKxh RV8g== X-Gm-Message-State: AOJu0YySbGn2kvXx7bg1J/xJRtgMjoahshTwhu20JNR09utLtovVQM/7 E8Gpy5Iq/+ujb5Jy831nLpaPhy1N4aARyN1SE/lx1IfjuNgFVKXFvgfjNCrTJceTKYr/pTRalIo CtCI+3sLQyiq5QCNGLmn7Es/k9oG8DesOsDwXcFXfhg6p74X+KlW/YJr8gBxJZMDfEejU7lhfeH g= X-Received: by 2002:adf:e411:0:b0:315:8f4f:81b2 with SMTP id g17-20020adfe411000000b003158f4f81b2mr3480753wrm.64.1693659582464; Sat, 02 Sep 2023 05:59:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuyJbadSpQe42h44s5/dOvqikDRZftxoXOU76sAcU8K9irETdD5ot8ppnrHc5NtLgun13ezA== X-Received: by 2002:adf:e411:0:b0:315:8f4f:81b2 with SMTP id g17-20020adfe411000000b003158f4f81b2mr3480742wrm.64.1693659582165; Sat, 02 Sep 2023 05:59:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 03/15] configure: remove HOST_CC Date: Sat, 2 Sep 2023 14:59:22 +0200 Message-ID: <20230902125934.113017-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659954134100003 $(HOST_CC) is only used to invoke the preprocessor, and $(CC) can be used instead now that there is a Tricore C compiler. Remove the variable from config-host.mak. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 1 - tests/tcg/tricore/Makefile.softmmu-target | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index b9af8282293..7743c18f2fe 100755 --- a/configure +++ b/configure @@ -1800,7 +1800,6 @@ fi mkdir -p tests/tcg echo "# Automatically generated by configure - do not modify" > $config_ho= st_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak -echo "HOST_CC=3D$host_cc" >> $config_host_mak =20 # versioned checked in the main config_host.mak above if test -n "$gdb_bin"; then diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/= Makefile.softmmu-target index aff7c1b5802..2ec0bd36225 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -28,7 +28,7 @@ TESTS +=3D test_context_save_areas.c.tst QEMU_OPTS +=3D -M tricore_testboard -cpu tc27x -nographic -kernel =20 %.pS: $(ASM_TESTS_PATH)/%.S - $(HOST_CC) -E -o $@ $< + $(CC) -E -o $@ $< =20 %.o: %.pS $(AS) $(ASFLAGS) -o $@ $< --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659664; cv=none; d=zohomail.com; s=zohoarc; b=RtkQLg4hpw25zj4PKd0IgROPSLQMYdefkiNFh9asvrEF8YxMY2rZrFKU9c4Zp3YCCXMXYLQrSAVDK1n9rxmo7fgOh0zQzmbHxfapZSLrMwCQSEs9Wpp3KFMIUgz3AmSmd9FZ9NmGI6m2EWvbjCOfCE41nbVOjLmDNTCH4ogZgzA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659664; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=eTC08l5E2LHxzBEzXg14rY8tH1ESV2HYzTzj23bXChc=; b=Iv9uG3KMIlSWxm79h9+QM/1cX0ygYKoU+3oDpGlsryF8KP496iZ8/nkp0npe3iUKcY7A/4RlIuoTs3B37wXWS0YTJOMwT0z01JPqAHredXZT/fOjbmfqelPA+AE0u3mYYZwkerIHHp9HDYGqqDPNijPwIavo4OK4OtjXEojdH1I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659664734477.4589160912884; Sat, 2 Sep 2023 06:01:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEB-0000zb-Ug; Sat, 02 Sep 2023 08:59:51 -0400 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 1qcQEA-0000wu-L4 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:50 -0400 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 1qcQE8-0001gR-A2 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:50 -0400 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-44-y3euDBcIOGSj9xfxFlzSYg-1; Sat, 02 Sep 2023 08:59:46 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-31c7727aa5cso1467937f8f.0 for ; Sat, 02 Sep 2023 05:59:45 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bs11-20020a056000070b00b0031f3780ce60sm1695182wrb.7.2023.09.02.05.59.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=eTC08l5E2LHxzBEzXg14rY8tH1ESV2HYzTzj23bXChc=; b=XAFCKAwFuDpQNfQWhUpJCVHDBxY0lOk1p852mQniK9AGDjPBiT+ohjVnkhlMYZ1zO0A5ew aSq25VFBUvrgvjnAgz70woOS4hhUoSqBRy5RAa/jHviHMwbBB9GuSzSLZCqIyNDm1TkuiV feLIhcj/Un+qI5xAFRSpja7Ul6v78L4= X-MC-Unique: y3euDBcIOGSj9xfxFlzSYg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659584; x=1694264384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eTC08l5E2LHxzBEzXg14rY8tH1ESV2HYzTzj23bXChc=; b=Oipv9PWtGS/XvIpErpSUVG/b33sipqAGN5MrUDgFG+g6K6MMbiu60ro9PO5eavsb88 uNqgA/0TWYW2BnhJBcBDEpJztLRiwjJhV7szYn3hQvOBXFGgrsK6x3uu1GfKP2xpPwew 4e9rsG7AuwoooYYN07kAU/UJ/+E2bErxp+qhDrK/X297Omji+5so9tgrY6QHMvhEpuqq rlBmthElN6HZCaHO9OUOcW65cYPEpE5IeF44In52UD6iPyXfFrO/1mpSgKyvLIJzUHVT Jjm4Ho7B4EQiWOLaLsykph0/9vDc7Uotw2+RKh6iX4atbj5+g0I9nxe6XUaGdAmU+exa 12Dw== X-Gm-Message-State: AOJu0YxOGO3JYy0kCdguw+iUkvnFOR+ytfV5mGlVxzftBt+mhP02j/nm 2jLuWv326MVdLEmiL0gAWd0bJzgTWHuqGSnpdvRgFP+kE8LjFBAQN/wti50VTtMIjTj6jW7Pz3G jXhopEW8czlFp0iGjMpJ5sOKTu9zrGBDPSED+Pv8IgN88a7seHwm4w0/iMM2GyGnJOPwRwcCLRP A= X-Received: by 2002:adf:e382:0:b0:319:8430:f80f with SMTP id e2-20020adfe382000000b003198430f80fmr4307031wrm.49.1693659584188; Sat, 02 Sep 2023 05:59:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGaArmF3GMN73lRajHBfWjw0CPtAh74iUSl7zgvJ3YypN0m6VHK9TVjrydWM/S4Fd5/UuP0HQ== X-Received: by 2002:adf:e382:0:b0:319:8430:f80f with SMTP id e2-20020adfe382000000b003198430f80fmr4307024wrm.49.1693659583949; Sat, 02 Sep 2023 05:59:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 04/15] configure: create native file with contents of $host_cc Date: Sat, 2 Sep 2023 14:59:23 +0200 Message-ID: <20230902125934.113017-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659665693100007 The argument of --host-cc is not obeyed when cross compiling. To avoid this issue, place it in a configuration file and pass it to meson with --native-file. While at it, clarify that --host-cc is not obeyed anyway when _not_ cross compiling, because cc=3D"$host_cc" is placed before --host-cc is processed. Reviewed-by: Richard Henderson Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 7743c18f2fe..378a0de9fb6 100755 --- a/configure +++ b/configure @@ -288,7 +288,7 @@ static=3D"no" # ${cross_prefix}gcc (if cross-prefix specified) # system compiler if test -z "${CC}${cross_prefix}"; then - cc=3D"$host_cc" + cc=3D"cc" else cc=3D"${CC-${cross_prefix}gcc}" fi @@ -927,8 +927,8 @@ Advanced options (experts only): -Dmesonoptname=3Dval passthrough option to meson unmodified --cross-prefix=3DPREFIX use PREFIX for compile tools, PREFIX can be b= lank [$cross_prefix] --cc=3DCC use C compiler CC [$cc] - --host-cc=3DCC use C compiler CC [$host_cc] for code run at - build time + --host-cc=3DCC when cross compiling, use C compiler CC for c= ode run + at build time [$host_cc] --cxx=3DCXX use C++ compiler CXX [$cxx] --objcc=3DOBJCC use Objective-C compiler OBJCC [$objcc] --extra-cflags=3DCFLAGS append extra C compiler flags CFLAGS @@ -1892,7 +1892,6 @@ if test "$skip_meson" =3D no; then echo "windres =3D [$(meson_quote $windres)]" >> $cross echo "windmc =3D [$(meson_quote $windmc)]" >> $cross if test "$cross_compile" =3D "yes"; then - cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross echo "system =3D '$targetos'" >> $cross case "$cpu" in @@ -1909,6 +1908,14 @@ if test "$skip_meson" =3D no; then else echo "endian =3D 'little'" >> $cross fi + cross_arg=3D"--cross-file config-meson.cross" + + native=3D"config-meson.native.new" + echo "# Automatically generated by configure - do not modify" > $native + echo "[binaries]" >> $native + echo "c =3D [$(meson_quote $host_cc)]" >> $native + mv $native config-meson.native + cross_arg=3D"$cross_arg --native-file config-meson.native" else cross_arg=3D"--native-file config-meson.cross" fi --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659841; cv=none; d=zohomail.com; s=zohoarc; b=ditc7iVDQrlBSXBDvbqJD018p5vyfnLnqBo2gYy+zME4c4NoCMtnozV/6MGPXLiNM3j5mtRGeHHGEV8fqZmkerkBjrM6tyzp6CxAZWbXBrDvAv8tdGL7v6EFhatZeZLwStU9RJGd0ICNdXOKExL0mNrxCg7OVzFnCkeesL3gM20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659841; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=9aPc6QuIQUSjFgfjtGm1gBlb1gbxgW+SxTCr4ISfE8k=; b=Q7v95pl/M2lDbkrFI5ABLmS2dwo0yyQh2kfng3UKSklLXg/bAkI7vvWcXP+sEqRWXb/X7KdC1qyrMLIPqv0AdH0TOGKS+AFkCEZRkAUhKrZMqJAPu5F4luyFehd2xJJVYmI3sLMBBk7Pw0kJBY7bXRUVCsi+YnDZDk2R9X8gYmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659841634820.4520436162119; Sat, 2 Sep 2023 06:04:01 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEE-00012m-07; Sat, 02 Sep 2023 08:59:54 -0400 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 1qcQEC-0000zj-Bc for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:52 -0400 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 1qcQE9-0001gt-S4 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:52 -0400 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-691-k-XUWVGUMMqVfckZzz1_FA-1; Sat, 02 Sep 2023 08:59:47 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-31f3233861aso360905f8f.2 for ; Sat, 02 Sep 2023 05:59:47 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id k1-20020adff5c1000000b0031ad5a54bedsm8532813wrp.9.2023.09.02.05.59.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659589; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9aPc6QuIQUSjFgfjtGm1gBlb1gbxgW+SxTCr4ISfE8k=; b=K1dE23B5nXjmroepP4APEtMgZi4ZQZZUouIMvtKIcS2Su6NQXZ+6YuYba6saAYjgaRimXf xvjsnhWCCDM9DQrSjyMV3b5ZHJ2n0aERucn4kHDqvQQujPNUyBa39lP/Wn1am4SI1j3sUd /MnUSfq9rQ1B78G/ZwEUEL38lttVLA8= X-MC-Unique: k-XUWVGUMMqVfckZzz1_FA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659586; x=1694264386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9aPc6QuIQUSjFgfjtGm1gBlb1gbxgW+SxTCr4ISfE8k=; b=RhLRN5Kp5tlMxbMJMwTzsKvRkAz3Z86I35iLuSVpBMscoO0IYAsTXurUpdlrJMyreE IqCAQTquoJiqTN/9BEODlEISb/9qa7R5prqFyAtjsoUVBneQKSev6Dv7Pjd8Jqn4NuDk nlvF6pwjxzmzZoIgoeINqVhRkIFxitWmDjoTqL6wiR1LOoJYWf2MdRgx4X0PZ/W/uP4C duA7ZD8/2vONPgNYL4F+R+gJKpTlaD9lSCrwM/feIAcFYLOelbf3cNemb6k+jAgbFQZK XdmkPXEK10ZzzBfnKE7YFaD+KkpwM9dPvxel1Qeunx8kMmOCzEzHJ5+8UwB2aUINsxAR Oaig== X-Gm-Message-State: AOJu0YyWbizfzCes+Vf+Y2/n4lSWjeEW8zDtadR/3TAqMuGmc1B7cFVe FSh5pRNRK0BRm43mIt12YKDP+rL5iMXNoQr9jMBxt553gYq35WyF4kRRZgQeC8EGd2hVEQfOWq2 ScSVcN/p5VUtun1uUm0SC3Vvi+uwqIHkwTYvdPsGKPsjrDk187eOmRKLvY6cdr9cCmGkFmDulxr U= X-Received: by 2002:a05:6000:10:b0:319:8261:2087 with SMTP id h16-20020a056000001000b0031982612087mr3524360wrx.43.1693659586017; Sat, 02 Sep 2023 05:59:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEDmtgGP6bA19E4YAQvgmKud8VQ2aGZfargJokHSkxUkJwjn2U9zC+Kl2hPf/xXPJauHtKDJg== X-Received: by 2002:a05:6000:10:b0:319:8261:2087 with SMTP id h16-20020a056000001000b0031982612087mr3524349wrx.43.1693659585610; Sat, 02 Sep 2023 05:59:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PATCH 05/15] meson: compile bundled device trees Date: Sat, 2 Sep 2023 14:59:24 +0200 Message-ID: <20230902125934.113017-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659843566100001 Content-Type: text/plain; charset="utf-8" If dtc is available, compile the .dts files in the pc-bios directory instead of using the precompiled binaries. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- pc-bios/Makefile | 19 ------------------- pc-bios/meson.build | 25 +++++++++++++++++++++---- 2 files changed, 21 insertions(+), 23 deletions(-) delete mode 100644 pc-bios/Makefile diff --git a/pc-bios/Makefile b/pc-bios/Makefile deleted file mode 100644 index 315288df84e..00000000000 --- a/pc-bios/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# NOTE: only compilable with x86 cross compile tools -# -include ../config-host.mak - -DEFINES=3D - -TARGETS=3D - -all: $(TARGETS) - -%.o: %.S - $(CC) $(DEFINES) -c -o $@ $< - -%.dtb: %.dts - dtc -I dts -O dtb -o $@ $< - -clean: - rm -f $(TARGETS) *.o *~ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a7224ef4699..e67fa433a1b 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -57,10 +57,6 @@ blobs =3D [ 'efi-e1000e.rom', 'efi-vmxnet3.rom', 'qemu-nsis.bmp', - 'bamboo.dtb', - 'canyonlands.dtb', - 'petalogix-s3adsp1800.dtb', - 'petalogix-ml605.dtb', 'multiboot.bin', 'multiboot_dma.bin', 'linuxboot.bin', @@ -84,6 +80,27 @@ blobs =3D [ 'vof-nvram.bin', ] =20 +dtc =3D find_program('dtc', required: false) +foreach f : [ + 'bamboo.dts', + 'canyonlands.dts', + 'petalogix-s3adsp1800.dts', + 'petalogix-ml605.dts', +] + out =3D fs.replace_suffix(f, '.dtb') + if dtc.found() + custom_target(f, + build_by_default: have_system, + input: files(f), + output: out, + install: get_option('install_blobs'), + install_dir: qemu_datadir, + command: [ dtc, '-I', 'dts', '-O', 'dtb', '-o', '@OUTPUT@', '@INPU= T0@' ]) + else + blobs +=3D out + endif +endforeach + if get_option('install_blobs') install_data(blobs, install_dir: qemu_datadir) endif --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659740; cv=none; d=zohomail.com; s=zohoarc; b=BME1b2nrgxKvXLq5uB64tHXn7Yp3/jG6c1TuUfby4nvRYknDBReQWp07c3NjYKzQYsk7haSciA1AidffIOpx8ERj+X/YQfy+LA5uWGZ1SDDeVfEil8vRx/uqgWr5lik1mUSQwIc1QwE2UX92/fUj7OpY6bPE6YJCy9oI1Ro6g4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659740; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=ZOV1XhtqUx3j/g8nBVKijBaYMWzAFoLgFvVysN0hnJxekiYhq4OM0LzZo2yztKzE0nWtioJcq6fLJv0A6itrqoHtHpNWBYMtyDDe/RoqkbbH8s9wg8E7YkWVaz2/1jK8pP63X8R4XsfD6zIQBUH0gKMxpSKRUWQbs32VX9eq2GY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659740724725.6555370680825; Sat, 2 Sep 2023 06:02:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEF-00017H-J1; Sat, 02 Sep 2023 08:59:55 -0400 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 1qcQEE-00013K-1L for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:54 -0400 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 1qcQEB-0001hC-Q0 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:53 -0400 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-652-fnDC_Bd8Nxm_8mEU4J8t8g-1; Sat, 02 Sep 2023 08:59:49 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-31c5c762f97so1647054f8f.1 for ; Sat, 02 Sep 2023 05:59:49 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d1-20020adfa401000000b0031980294e9fsm4995496wra.116.2023.09.02.05.59.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659591; 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=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=KYhGoFLe6z/0kXg2VPW2K0F9APWMezK8+pE2kbD59cUD6gvip9m5qq0XDAWmzfFmWSJT64 3qHiL34VEr4zyTSW6zM3JFC8W3/DSh5Apm2uMXeB7fDxmGgq5nhIySxiaiPZW0GJ0RZ1C9 6Chcr8cSSFNIaaO0GyPKXwXE/oXBxXE= X-MC-Unique: fnDC_Bd8Nxm_8mEU4J8t8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659588; x=1694264388; 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=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=HoUQhkJdfKKRgs0pWm5fXnSZOuM28f7sntLwv/mGjSnkQ6JqmXiBD3jTT9Pgx0rLzw dg+IczXDiTcMXCFp3epHDSeMBgCy+NnoeQNkcPxIuG0FJbwt06o4qIqukxJcAMbDyxsb V8iASMIxtYHa14azCx+/JwNLYK7FH0PGhUWRBC4Uq2dW4r73cOwx3QgmZp4X2fhyw0ru YLzYxIK5xHuJaUTKEtcofNupeQiOVZmMxRFln4nXjYlMrKqdL9V4Le6A1rvvM9Z5DkYF vSzqBUSAZyE9YXRpagmWbldA90ccnwJnFzm2POXOnxU2cIlgGecL8rxh9oHWboDTWS0r yS6w== X-Gm-Message-State: AOJu0Yzm/5KIjSaDkvX7bNXGp8fWffS9uJbQ9Nox4fJhngXGezAW0OSb 5m5T34R8zw9xa7Pwyh3PrKE60FSkAIyEdddC4izhnrNUFKz/RmiGelv8FSiEx5tOKmzc8Ij4IEy eU1anrmWEHxqHwBoyS+YxHcnX30SE+UHQfF4Gx7ULR2nM1rR6xkdTJ8hSl+jYkiE4fO2BKPFnaq 4= X-Received: by 2002:a05:6000:10cf:b0:314:748:d59d with SMTP id b15-20020a05600010cf00b003140748d59dmr3464620wrx.27.1693659587819; Sat, 02 Sep 2023 05:59:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpWjliVqVheTHM/U1Me/RRj2jM8hR14tLqitVIefTS/sfPdRJhpsUSsVX+5FtaXaz2LH+WZw== X-Received: by 2002:a05:6000:10cf:b0:314:748:d59d with SMTP id b15-20020a05600010cf00b003140748d59dmr3464609wrx.27.1693659587474; Sat, 02 Sep 2023 05:59:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/15] configure: remove boolean variables for targets Date: Sat, 2 Sep 2023 14:59:25 +0200 Message-ID: <20230902125934.113017-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659742913100003 Content-Type: text/plain; charset="utf-8" Just use $targetos always. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- configure | 55 +++++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/configure b/configure index 378a0de9fb6..f96f7359a83 100755 --- a/configure +++ b/configure @@ -374,45 +374,14 @@ fi =20 # OS specific =20 -mingw32=3D"no" -bsd=3D"no" -linux=3D"no" -solaris=3D"no" case $targetos in windows) - mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; -gnu/kfreebsd) - bsd=3D"yes" -;; -freebsd) - bsd=3D"yes" - # needed for kinfo_getvmmap(3) in libutil.h -;; -dragonfly) - bsd=3D"yes" -;; -netbsd) - bsd=3D"yes" -;; -openbsd) - bsd=3D"yes" -;; -darwin) - bsd=3D"yes" - darwin=3D"yes" -;; -sunos) - solaris=3D"yes" -;; haiku) pie=3D"no" ;; -linux) - linux=3D"yes" -;; esac =20 if test ! -z "$cpu" ; then @@ -627,7 +596,7 @@ do fi done =20 -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows" ; then EXESUF=3D".exe" prefix=3D"/qemu" bindir=3D"" @@ -809,7 +778,7 @@ for opt do ;; --enable-download) download=3D"enabled"; git_submodules_action=3Dupdate; ;; - --enable-plugins) if test "$mingw32" =3D "yes"; then + --enable-plugins) if test "$targetos" =3D "windows"; then error_exit "TCG plugins not currently supported on= Windows platforms" else plugins=3D"yes" @@ -1080,7 +1049,7 @@ fi # by default. Only enable by default for git builds if test -z "$werror" ; then if test -e "$source_path/.git" && \ - { test "$linux" =3D "yes" || test "$mingw32" =3D "yes"; }; then + { test "$targetos" =3D linux || test "$targetos" =3D "windows"; };= then werror=3D"yes" else werror=3D"no" @@ -1718,7 +1687,7 @@ echo all: >> $config_host_mak if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows"; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO-Linux}" >> $config_host_mak @@ -1727,24 +1696,26 @@ else echo "CONFIG_POSIX=3Dy" >> $config_host_mak fi =20 -if test "$linux" =3D "yes" ; then +if test "$targetos" =3D "linux" ; then echo "CONFIG_LINUX=3Dy" >> $config_host_mak fi =20 -if test "$darwin" =3D "yes" ; then +if test "$targetos" =3D "darwin" ; then echo "CONFIG_DARWIN=3Dy" >> $config_host_mak fi =20 -if test "$solaris" =3D "yes" ; then +if test "$targetos" =3D "sunos" ; then echo "CONFIG_SOLARIS=3Dy" >> $config_host_mak fi echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak =20 # XXX: suppress that -if [ "$bsd" =3D "yes" ] ; then - echo "CONFIG_BSD=3Dy" >> $config_host_mak -fi +case $targetos in + gnu/kfreebsd | freebsd | dragonfly | netbsd | openbsd | darwin) + echo "CONFIG_BSD=3Dy" >> $config_host_mak + ;; +esac =20 if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak @@ -1774,7 +1745,7 @@ echo "CC=3D$cc" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers for KVM architectures -if test "$linux" =3D "yes" && test -n "$linux_arch"; then +if test "$targetos" =3D "linux" && test -n "$linux_arch"; then symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm fi =20 --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659664; cv=none; d=zohomail.com; s=zohoarc; b=AvcoCGshIgBrv7YMOANt5GilLOL90jruOZdvfq8EErkWXuxsRJKXERd1r0PXZKzwO4FuhYhNZQJ73xugpH017tOUl8vRzjpPBQSmbDXHVLzgrdgao9WGBf9L58VNzl5rYsSq/b+hKbA9qpq8CaA5i3TmEywMy8JJ0izB3ADYEws= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659664; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=k/p9QPRRWGG4B7tJGNdk16lD/c2yXoWPGLZHm5emGOI=; b=Bf6TIgoBtCtDJRvkm2BxVRBroquAi3xaJY8xoQqTaQ5dQeFPrzENwT7IEsUnGcm+wu7GqgSVLxq8BLML68Xlh5pAes3hTnRPiXjq1JXrG4BOLRrRykEuFe+JdGmxNyTBR56gKD07yNmLJfnSCnmTvQ+24mQC67MSOrhk38aOtOo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16936596642823.196356201523713; Sat, 2 Sep 2023 06:01:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEG-00019o-L8; Sat, 02 Sep 2023 08:59:56 -0400 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 1qcQEF-00017I-NW for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:55 -0400 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 1qcQED-0001hj-BB for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:55 -0400 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-352-KgJUtXqLMtyoUBAHnXSOqg-1; Sat, 02 Sep 2023 08:59:51 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-31aef28315eso1628893f8f.2 for ; Sat, 02 Sep 2023 05:59:50 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id h12-20020a5d688c000000b0031ae2a7adb5sm8417559wru.85.2023.09.02.05.59.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659592; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=k/p9QPRRWGG4B7tJGNdk16lD/c2yXoWPGLZHm5emGOI=; b=TVNTUe17MXv0/1d2RMAVXOpGsPPIMkeZlGK9DGI9+zxT91kzpUdQTqtg8i8mrtHSnGPMdY BURIubN46BKO1Gdr0mekCITTUzUFpQpdOTCxXwjDevVKX5FBD7aFrGG/7jQ58X9WBtvt4f t6TLk/8dTOpE+RrtlLBTglAYV3h4+xY= X-MC-Unique: KgJUtXqLMtyoUBAHnXSOqg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659589; x=1694264389; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k/p9QPRRWGG4B7tJGNdk16lD/c2yXoWPGLZHm5emGOI=; b=gTHhLmQIXkBOaKjb9PGmwxUDxF2/DiY730oi0uKAzGhSmepQPLH4Bab2o8mwq4Kzam e+70vaH31zk2WcUmwK+iQaSbO9+Bali3ABDacHRACs+lnX6MSJm86aZBiJ9DguEV4WoL WBZ7jXPAlHGGOo9kc4NXBcFkdNuEFaS1dt+gy/zO/gTTnNs9W9V9DpWVtrzLLJLB9O2J 2Mlky9f454yjbyCY9ElVu5lKZmV88+pTbRi1vK87EzRxdFiQAbdlXnrAYbqN9qQ+FLZ8 BIsMi6hFuTf+BSTnx4jaVHqjFvYb3hCiTkpCuDF/DSX16NPfV1fwfZaw26Nzx0e3Ycqd mYPA== X-Gm-Message-State: AOJu0YwBYJ5wCGpZV2ti7Xw/n/VmFI/YMsG75K1oguM0EG082KrsHA8k 7mu82p96LdS0MjIkQXSl5gT0PSLQ1wAVcSZKCq7yJq6QRVeGngR0vpRyq9cdsMgQ6/EpDiXSClL yGlPBMkV6uB6GOkjKJbjwnuNmKnaoZW1QeaVtt1v3HY897Tny/R18pbTIReKNF3yYTKM1gyjOGj M= X-Received: by 2002:adf:e7cc:0:b0:31a:dc2e:2db2 with SMTP id e12-20020adfe7cc000000b0031adc2e2db2mr4104680wrn.49.1693659589077; Sat, 02 Sep 2023 05:59:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGVzrkjaiVxy4O6lzWDrA2P6ep2m1USAGqFhk+Ffvi1qT+Ce2nvLPzkjhyrmOSJPeMmWwDTCQ== X-Received: by 2002:adf:e7cc:0:b0:31a:dc2e:2db2 with SMTP id e12-20020adfe7cc000000b0031adc2e2db2mr4104673wrn.49.1693659588825; Sat, 02 Sep 2023 05:59:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson , Peter Maydell Subject: [PATCH 07/15] configure: move --enable-debug-tcg to meson Date: Sat, 2 Sep 2023 14:59:26 +0200 Message-ID: <20230902125934.113017-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659665661100006 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Reviewed-by: Peter Maydell Signed-off-by: Paolo Bonzini --- configure | 11 +---------- meson.build | 3 ++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/configure b/configure index f96f7359a83..afd6121b616 100755 --- a/configure +++ b/configure @@ -248,7 +248,6 @@ done =20 git_submodules_action=3D"update" git=3D"git" -debug_tcg=3D"no" docs=3D"auto" EXESUF=3D"" prefix=3D"/usr/local" @@ -727,13 +726,9 @@ for opt do # configure to be used by RPM and similar macros that set # lots of directory switches by default. ;; - --enable-debug-tcg) debug_tcg=3D"yes" - ;; - --disable-debug-tcg) debug_tcg=3D"no" - ;; --enable-debug) # Enable debugging options that aren't excessively noisy - debug_tcg=3D"yes" + meson_option_parse --enable-debug-tcg "" meson_option_parse --enable-debug-graph-lock "" meson_option_parse --enable-debug-mutex "" meson_option_add -Doptimization=3D0 @@ -933,7 +928,6 @@ cat << EOF linux-user all linux usermode emulation targets bsd-user all BSD usermode emulation targets pie Position Independent Executables - debug-tcg TCG debugging (default is disabled) =20 NOTE: The object files are built at the place where configure is launched EOF @@ -1684,9 +1678,6 @@ echo >> $config_host_mak =20 echo all: >> $config_host_mak =20 -if test "$debug_tcg" =3D "yes" ; then - echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak -fi if test "$targetos" =3D "windows"; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak diff --git a/meson.build b/meson.build index 9bcf117f8a4..baf47613650 100644 --- a/meson.build +++ b/meson.build @@ -2199,6 +2199,7 @@ config_host_data.set10('CONFIG_COROUTINE_POOL', have_= coroutine_pool) config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lo= ck')) config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex')) config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_u= sage')) +config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg')) config_host_data.set('CONFIG_GPROF', get_option('gprof')) config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block= _migration').allowed()) config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug')) @@ -4156,7 +4157,7 @@ if config_all.has_key('CONFIG_TCG') summary_info +=3D {'TCG backend': 'native (@0@)'.format(cpu)} endif summary_info +=3D {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')} - summary_info +=3D {'TCG debug enabled': config_host.has_key('CONFIG_DEBU= G_TCG')} + summary_info +=3D {'TCG debug enabled': get_option('debug_tcg')} endif summary_info +=3D {'target list': ' '.join(target_dirs)} if have_system diff --git a/meson_options.txt b/meson_options.txt index aaea5ddd779..5d6b889554c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,6 +83,8 @@ option('xen_pci_passthrough', type: 'feature', value: 'au= to', description: 'Xen PCI passthrough support') option('tcg', type: 'feature', value: 'enabled', description: 'TCG support') +option('debug_tcg', type: 'boolean', value: false, + description: 'TCG debugging') option('tcg_interpreter', type: 'boolean', value: false, description: 'TCG with bytecode interpreter (slow)') option('safe_stack', type: 'boolean', value: false, diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 9da3fe299b7..5567fd29985 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -29,6 +29,7 @@ meson_options_help() { printf "%s\n" ' --enable-debug-mutex mutex debugging support' printf "%s\n" ' --enable-debug-stack-usage' printf "%s\n" ' measure coroutine stack usage' + printf "%s\n" ' --enable-debug-tcg TCG debugging' printf "%s\n" ' --enable-fdt[=3DCHOICE] Whether and how to find the = libfdt library' printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' printf "%s\n" ' --enable-fuzzing build fuzzing targets' @@ -276,6 +277,8 @@ _meson_option_parse() { --disable-debug-mutex) printf "%s" -Ddebug_mutex=3Dfalse ;; --enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=3Dtrue ;; --disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=3Dfalse ;; + --enable-debug-tcg) printf "%s" -Ddebug_tcg=3Dtrue ;; + --disable-debug-tcg) printf "%s" -Ddebug_tcg=3Dfalse ;; --enable-dmg) printf "%s" -Ddmg=3Denabled ;; --disable-dmg) printf "%s" -Ddmg=3Ddisabled ;; --docdir=3D*) quote_sh "-Ddocdir=3D$2" ;; --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659750; cv=none; d=zohomail.com; s=zohoarc; b=jSa6mKqCxyPvTkpl1Z4e9qqzlZc6I5xoHqbXck+qVgOUcIqMWefgcU9boXjpTAyOyNWLCdDw+c4ighrW/I64JrjNYPJCl7nG2D9/opVuK86lcvOxkI75UEFPevnY5pwvvk/b/4W3vWjkYRomQI2L6xs/CS1p70gsQLliklJzs0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659750; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QSmlrs0rjxYxWDp5Xt8aIVKmdYFzTslCtqqGTiwtP84=; b=iKxcUnWulhbJ2wPGUrvu5iDJ9sRKX+vF3BL0yd4YdURH6kNhY9bQV6p0sKfAwq2Y99Xyb7nF8ikH4QGOJibg8t1TIVnwUs4j1txo4nkN67F9qB2pyIx0Figju0z68BNLBCLbsKg8vwnu5naZ7wToH+5iqeSXwiXyifh7XR9A4FY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659750926717.2121705138658; Sat, 2 Sep 2023 06:02:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEJ-0001As-6S; Sat, 02 Sep 2023 08:59:59 -0400 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 1qcQEH-0001Ai-Fl for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:57 -0400 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 1qcQEF-0001i3-2z for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:57 -0400 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-675-yd8kCiiXM7uRgsXTGdeDPw-1; Sat, 02 Sep 2023 08:59:53 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-401dba99384so18833785e9.3 for ; Sat, 02 Sep 2023 05:59:52 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id p1-20020a05600c204100b003fe1630a8f0sm10956297wmg.24.2023.09.02.05.59.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659594; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QSmlrs0rjxYxWDp5Xt8aIVKmdYFzTslCtqqGTiwtP84=; b=eKHUBe4ZvxOgOq+UMMjNVGVkO6lCJQ5gz6FOVGwfHf0Ut7DOvuJVVIdw9/+r+B6JnJXci+ OoVboRaEySNHgK2RSrc3gxOD+Mobp4kejTd3ZtKcQb4KTfsTyHvcQYjXpoAXW9P4yFIjt0 f0A62cZaR3ndBq8WV5Zfs6qTBROJNuA= X-MC-Unique: yd8kCiiXM7uRgsXTGdeDPw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659591; x=1694264391; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QSmlrs0rjxYxWDp5Xt8aIVKmdYFzTslCtqqGTiwtP84=; b=BbdZh0A234L78uJCsNZohTu5woObsgObYNxzjMdNpeK7qwxLew3fIUk8trDu+xV8RW mSaF21XryTS0tEAgrMQN0L+oRb0jM3TiTYGGayxUiNwwvou5qt1+eOI2PDRCYstGEMqx b0rGl14snspEpoFyR64ta96ucJYmBVAJcJ5zZBW89RyHPLbGPxwfq14pYSfci3JLyVpn M7OnQadde7yKpO2ZzQzxaAf2I6iD08TaTuZzGCzmlU2D2jvO4eKRBL+LBmECHgc42M3Q Lm0Lv++/hkgYFTvz9b+JB4EFFgj3+4h6XrWJw6QTm9dgTu3lRgehdmQaxp9o5C2LzBev iNPA== X-Gm-Message-State: AOJu0YzBVxO0yG0kGYesEQMVtyeRXH+HcMfzRNORaf+BoeVdMhylWuuU Qy6yJj7z8/Qkwez+jk4Cf55EaDzThpvKBTjXkBaUZNolo6xKdDnWDTUShsn3E/dKuYVGjhXPE/V ZICC+GxVS4hmv525eaAqbum+P6hWI3Fs+cLzNCgE284H8Wa0x68OaNy+5SO/QSn8T6lg92eZGcf E= X-Received: by 2002:a7b:c859:0:b0:3fe:dcd0:2e32 with SMTP id c25-20020a7bc859000000b003fedcd02e32mr3399452wml.19.1693659591391; Sat, 02 Sep 2023 05:59:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF1orhzNhrCwqzUFry2EiO/NlGhgnmieYYPr8CE7RgflmNfBB+3cNg+cyYkB+ML7sS5SMi9hA== X-Received: by 2002:a7b:c859:0:b0:3fe:dcd0:2e32 with SMTP id c25-20020a7bc859000000b003fedcd02e32mr3399442wml.19.1693659590914; Sat, 02 Sep 2023 05:59:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 08/15] meson: test for CONFIG_TCG in config_all Date: Sat, 2 Sep 2023 14:59:27 +0200 Message-ID: <20230902125934.113017-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659751484100001 CONFIG_TCG is not included in *-config-devices.h, so the test is always failing. Fixes: 74884cb1a6d ("qtest/meson.build: check CONFIG_TCG for boot-serial-te= st in qtests_ppc", 2022-03-14) Fixes: 44d827ea69e ("qtest/meson.build: check CONFIG_TCG for prom-env-test = in qtests_ppc", 2022-03-14) Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- tests/qtest/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index df63909ee51..c0751ef7c35 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -155,8 +155,8 @@ qtests_ppc =3D \ qtests_filter + \ (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] = : []) + \ (config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + = \ - (config_all_devices.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + = \ - (config_all_devices.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) += \ + (config_all.has_key('CONFIG_TCG') ? ['prom-env-test'] : []) + = \ + (config_all.has_key('CONFIG_TCG') ? ['boot-serial-test'] : []) + = \ ['boot-order-test'] =20 qtests_ppc64 =3D \ --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659789; cv=none; d=zohomail.com; s=zohoarc; b=gX3UKWK9LPGAwcKrQuxIFTyWMhlMIc4DUiCrVYt2g3cNfteDcWX8yfR9FiBm8iefr2Lu2d3/hUAdj4goGFWSKG3GDV8OtFUyruXGVUliXgGxwCnClZnjgZVqvZrijgE+P9+y+6jy+d7ePhB3MQ+CUcpuFeXBAgx4zZkBQwY+yHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659789; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ASlqPfRTx1HqkKZS28AHHrSkUMgZS0lrgJaZwtX7dp0=; b=mwY6aAP8+tASK9A9YS7u0bvtoQTvGoQGP0T0l29NXyLlvQf+CU8B+4Evjk8URN0j5O8SvvnP9NZwOpqeCeeFbyGdBBKysTbfPD4L1NQeSsdRI9IYFnNK7PmO1ZAs0bI6eO/Jg1wWR0D5gmH8Wcoe3OgN0C+Jpi0akJFQnhSX38k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659789784116.18205523048698; Sat, 2 Sep 2023 06:03:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEL-0001CO-RI; Sat, 02 Sep 2023 09:00:02 -0400 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 1qcQEJ-0001BA-Pn for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:59 -0400 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 1qcQEH-0001iO-Hf for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:59 -0400 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-689-Po1VeB4rO5esmcwKmhbneQ-1; Sat, 02 Sep 2023 08:59:54 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4005f0a53c5so19219655e9.3 for ; Sat, 02 Sep 2023 05:59:54 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id l3-20020a1ced03000000b003feae747ff2sm11181296wmh.35.2023.09.02.05.59.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ASlqPfRTx1HqkKZS28AHHrSkUMgZS0lrgJaZwtX7dp0=; b=A8tkr9C+krOl7vZHNxSbs1uj/0bK6Iqp0BAi8/CSEAJ1a8RBXAyXAfqV9nn8TqPDPK9r28 aTQ5k05nubt/PSC1elQ2uM+2t8t2m9oPGvSeaWTMbhfXlJGKsPdnE6QdmcQluSJJ0OkglC 7a1FJ8NutKi3j+wPAK9SU2D+ye5JgEw= X-MC-Unique: Po1VeB4rO5esmcwKmhbneQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659593; x=1694264393; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ASlqPfRTx1HqkKZS28AHHrSkUMgZS0lrgJaZwtX7dp0=; b=HSaOX8aWSvTBjU/2CU75E0R0bNB7gDZNTfpyWs30vziOIkSxwk2HeSQKMi/H4GNRE7 d9AP2RgDxxBdhR7v7skQVa0XClCjgSrxniE2HO31lYLae32yvQxxB4AQxt/ZQF34bYSE TKOQaADhjH7L6HO2Yy5MzCr9emUcYeU4evC6Gzxd5cxuzUF7v2nFw1dZ0Us7/unC78G9 ejtqhk/tVIdMRSDudYZacYb1WjbkFidnG+ZGWMtPLFn10IiqQjXLsSuVyO3G6iCqmn+r G09E8RK/qiPab7P++AZ0U0TrxeqtXkGOfa0h/0QfEcj1+USjHi7I7ciyOC+KkAYYmnEp 8p4g== X-Gm-Message-State: AOJu0YyBoqUiWXqVbv0QK5/QOKUIZMtCtJyjhMPG8nKEMcz+0LW4c7qO vNaIsGnPaIdPOm8wCPIP8V6+rF9Q9bypWF8O77UBkHxyPVaj3jzPUaS+wgRLWJJ4JaPtdN0NkSK h9p8FApL9y5Xzi0gc4X8dhrJqNSMeSpZiJAWah3bKZ+tkWlqkUXWHA/zW9j9U61HVn7CMF2Lt0h s= X-Received: by 2002:a1c:790b:0:b0:401:b654:e8e7 with SMTP id l11-20020a1c790b000000b00401b654e8e7mr3786688wme.28.1693659593146; Sat, 02 Sep 2023 05:59:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPFbV1Z6U3OuSKPIsvSauFr2bXqQE0z15d2Ve7pfaf6ePa/FGPFALtKArAPxHEQjc8S154Eg== X-Received: by 2002:a1c:790b:0:b0:401:b654:e8e7 with SMTP id l11-20020a1c790b000000b00401b654e8e7mr3786680wme.28.1693659592637; Sat, 02 Sep 2023 05:59:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PATCH 09/15] contrib/plugins: use an independent makefile Date: Sat, 2 Sep 2023 14:59:28 +0200 Message-ID: <20230902125934.113017-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659790311100001 The initial reason to write this patch was to remove the last use of CONFIG_DEBUG_TCG from the makefiles; the flags to use to build TCG plugins are unrelated to --enable-debug-tcg, and instead they should be the same as those used to build emulators (the plugins are not build via meson for demonstration reasons only). However, since contrib/plugins/Makefile is also the last case of doing a compilation job using config-host.mak, go a step further and make it use a completely separate configuration file, removing all references to compilers from the toplevel config-host.mak. Clean up references to empty variables, and use .SECONDARY so that intermediate object files are not deleted. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 12 +++++++++--- contrib/plugins/Makefile | 18 +++++++++--------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configure b/configure index afd6121b616..1be8b430a54 100755 --- a/configure +++ b/configure @@ -245,7 +245,7 @@ for opt do esac done =20 - +default_cflags=3D'-O2 -g' git_submodules_action=3D"update" git=3D"git" docs=3D"auto" @@ -732,6 +732,7 @@ for opt do meson_option_parse --enable-debug-graph-lock "" meson_option_parse --enable-debug-mutex "" meson_option_add -Doptimization=3D0 + default_cflags=3D'-O0 -g' ;; --disable-tcg) tcg=3D"disabled" plugins=3D"no" @@ -1731,8 +1732,6 @@ echo "PYTHON=3D$python" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak echo "NINJA=3D$ninja" >> $config_host_mak -echo "PKG_CONFIG=3D${pkg_config}" >> $config_host_mak -echo "CC=3D$cc" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers for KVM architectures @@ -1757,6 +1756,13 @@ if test "$ccache_cpp2" =3D "yes"; then echo "export CCACHE_CPP2=3Dy" >> $config_host_mak fi =20 +# contrib/plugins configuration +echo "# Automatically generated by configure - do not modify" > contrib/pl= ugins/$config_host_mak +echo "SRC_PATH=3D$source_path/contrib/plugins" >> contrib/plugins/$config_= host_mak +echo "PKG_CONFIG=3D${pkg_config}" >> contrib/plugins/$config_host_mak +echo "CC=3D$cc $CPU_CFLAGS" >> contrib/plugins/$config_host_mak +echo "CFLAGS=3D${CFLAGS-$default_cflags} $EXTRA_CFLAGS" >> contrib/plugins= /$config_host_mak + # tests/tcg configuration (config_host_mak=3Dtests/tcg/config-host.mak mkdir -p tests/tcg diff --git a/contrib/plugins/Makefile b/contrib/plugins/Makefile index b2b9db9f51a..0751201bcb3 100644 --- a/contrib/plugins/Makefile +++ b/contrib/plugins/Makefile @@ -6,11 +6,11 @@ # programs that the main configure has already done for us. # =20 -BUILD_DIR :=3D $(CURDIR)/../.. +include config-host.mak =20 -include $(BUILD_DIR)/config-host.mak +TOP_SRC_PATH =3D $(SRC_PATH)/../.. =20 -VPATH +=3D $(SRC_PATH)/contrib/plugins +VPATH +=3D $(SRC_PATH) =20 NAMES :=3D NAMES +=3D execlog @@ -26,21 +26,21 @@ SONAMES :=3D $(addsuffix .so,$(addprefix lib,$(NAMES))) =20 # The main QEMU uses Glib extensively so it's perfectly fine to use it # in plugins (which many example do). -CFLAGS :=3D $(shell $(PKG_CONFIG) --cflags glib-2.0) -CFLAGS +=3D -fPIC -Wall -CFLAGS +=3D $(if $(CONFIG_DEBUG_TCG), -ggdb -O0) -CFLAGS +=3D -I$(SRC_PATH)/include/qemu +PLUGIN_CFLAGS :=3D $(shell $(PKG_CONFIG) --cflags glib-2.0) +PLUGIN_CFLAGS +=3D -fPIC -Wall +PLUGIN_CFLAGS +=3D -I$(TOP_SRC_PATH)/include/qemu =20 all: $(SONAMES) =20 %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CFLAGS) $(PLUGIN_CFLAGS) -c -o $@ $< =20 lib%.so: %.o - $(CC) -shared -Wl,-soname,$@ -o $@ $^ $(LDLIBS) + $(CC) -shared -Wl,-soname,$@ -o $@ $^ =20 clean: rm -f *.o *.so *.d rm -Rf .libs =20 .PHONY: all clean +.SECONDARY: --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659976; cv=none; d=zohomail.com; s=zohoarc; b=U55WppxnW5uUjMqlGke4Rs5Y9z4rw9kQEQH+lDL2rEEr5ImjDhEmXmWAJj+zJG1ftxHdZsuLzmdlDWJlB+4CoQWKNn99UF57UVqFdMjm3JWK4mSTx0gX+lMF0dh7UjkKCCiTbWDWK1wI8sj6Q0hUzSAAHzw4xbP7X/2jytgh91M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659976; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qSmsxj0F9zLlEDlOc9BUZf4KydooBJ42LvrgpdbGCY4=; b=CkgzGlDYerxBoWALuQorcRbzfX6S3hJkvJZvnCkyFBKveBvvhffHfalgJX9/stWZADewqoRsws/7zYK7TK8S4IYTYipYsQ+DOT0iJhv8KQNFLEJTEAtB6+rthsOY+cxj0ZAUgiz/oEAFw5NfecU/MNRIAEu3AuIzNwda/Zs4W5Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659976265129.19392014642756; Sat, 2 Sep 2023 06:06:16 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQER-0001Cs-1O; Sat, 02 Sep 2023 09:00:07 -0400 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 1qcQEL-0001CX-Sm for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:02 -0400 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 1qcQEJ-0001if-DJ for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:01 -0400 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-17-uapJV6D0MXOKa9XsuMg98Q-1; Sat, 02 Sep 2023 08:59:57 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-402493d2997so11395835e9.0 for ; Sat, 02 Sep 2023 05:59:56 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id f3-20020a7bc8c3000000b00401c595fcc7sm11060883wml.11.2023.09.02.05.59.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659598; 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=qSmsxj0F9zLlEDlOc9BUZf4KydooBJ42LvrgpdbGCY4=; b=hOTerFVQiDmNFiY9ooA+hyPUrKpHblZDfJoWWrorKwl6VQSRkynyNoY6U5WZTIWKbdrRL8 BgG5b3y7rIAHnm3qTfgR3uOGnGrjxMZ16J7Yw87QqMrkELRINZiuYkC1sPFM5+PMwP0mzp fhO3/ezlPygrgyaktrIdaGxxJh3GT2E= X-MC-Unique: uapJV6D0MXOKa9XsuMg98Q-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659595; x=1694264395; 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=qSmsxj0F9zLlEDlOc9BUZf4KydooBJ42LvrgpdbGCY4=; b=DKWmdZAu8UOJ8LEtQBMxSqck6sXUUOzB9XG/Pcy+MhE7rNwu6gRzKjBVWkn6fg4XpK 6SNopVrZf+VoBtf7UBZN+S8o2HkALj2qTh3tlsZ7GnIllmAcQSNN9NXMjq6tpEBjapLA t/CYkOM1Aag/xyZRQA+EGwxnqS54hk7a8oL6lW9MWNKg1DHUrYjsmCiY+jmxT3sBM7ah BrCsrnfDshRPKK3h5GOni6ebNMyl00Z6wucE6vPar5DID4LrkRpe3xlinCY859IX3WXA 47VRMqyRM66hBFAivawRn3XiFMYNgMGmj8RprXHjHmSQjQ820zQKstmvh2W2GGKalTbc RDGA== X-Gm-Message-State: AOJu0YxOfLxqFIssNYfJH2V5o0wVRgLE6MEMYGvmDSoj7BtLGNsJEu4K 6DOhs/A3pa6PJVkUrSrYLTEhGFobOggWRPSb+/ZZ74jvICYuo/C9f4LlWOr8Evem0rUkBXSeagC SFDP3zsM5gOBsZfDm7CmmXf8301is0oXdYuNVu6Mza3AC93q5aygoWaloEDGLO9sVLg/tifTCfk w= X-Received: by 2002:a05:600c:2111:b0:401:cf0d:25ca with SMTP id u17-20020a05600c211100b00401cf0d25camr3604399wml.40.1693659595438; Sat, 02 Sep 2023 05:59:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHtYH+qiVTYJNRhuVh6FcOLlCJkxWXp0jNR2sBEOlRGNZJbFzqR0Twsj8ZaqBjX7xyWMxvDg== X-Received: by 2002:a05:600c:2111:b0:401:cf0d:25ca with SMTP id u17-20020a05600c211100b00401cf0d25camr3604395wml.40.1693659595083; Sat, 02 Sep 2023 05:59:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/15] configure: unify recursion into sub-Makefiles Date: Sat, 2 Sep 2023 14:59:29 +0200 Message-ID: <20230902125934.113017-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659978022100001 Content-Type: text/plain; charset="utf-8" Treat contrib/plugins the same as the firmware. Signed-off-by: Paolo Bonzini --- Makefile | 27 ++++++++++++--------------- configure | 13 ++++++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index 5d48dfac18a..118c28e80d9 100644 --- a/Makefile +++ b/Makefile @@ -164,14 +164,6 @@ ifneq ($(filter $(ninja-targets), $(ninja-cmd-goals)),) endif endif =20 -ifeq ($(CONFIG_PLUGIN),y) -.PHONY: plugins -plugins: - $(call quiet-command,\ - $(MAKE) $(SUBDIR_MAKEFLAGS) -C contrib/plugins V=3D"$(V)", \ - "BUILD", "example plugins") -endif # $(CONFIG_PLUGIN) - else # config-host.mak does not exist ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOAL= S),,fail)) $(error Please call configure before running make) @@ -184,15 +176,20 @@ include $(SRC_PATH)/tests/Makefile.include =20 all: recurse-all =20 -ROMS_RULES=3D$(foreach t, all clean distclean, $(addsuffix /$(t), $(ROMS))) -.PHONY: $(ROMS_RULES) -$(ROMS_RULES): +SUBDIR_RULES=3D$(foreach t, all clean distclean, $(addsuffix /$(t), $(SUBD= IRS))) +.PHONY: $(SUBDIR_RULES) +$(SUBDIR_RULES): $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" $(notdir $@),) =20 +ifneq ($(filter contrib/plugins, $(SUBDIRS)),) +.PHONY: plugins +plugins: contrib/plugins/all +endif + .PHONY: recurse-all recurse-clean -recurse-all: $(addsuffix /all, $(ROMS)) -recurse-clean: $(addsuffix /clean, $(ROMS)) -recurse-distclean: $(addsuffix /distclean, $(ROMS)) +recurse-all: $(addsuffix /all, $(SUBDIRS)) +recurse-clean: $(addsuffix /clean, $(SUBDIRS)) +recurse-distclean: $(addsuffix /distclean, $(SUBDIRS)) =20 ###################################################################### =20 @@ -296,7 +293,7 @@ help: $(call print-help,cscope,Generate cscope index) $(call print-help,sparse,Run sparse on the QEMU source) @echo '' -ifeq ($(CONFIG_PLUGIN),y) +ifneq ($(filter contrib/plugins, $(SUBDIRS)),) @echo 'Plugin targets:' $(call print-help,plugins,Build the example TCG plugins) @echo '' diff --git a/configure b/configure index 1be8b430a54..9980eaeef57 100755 --- a/configure +++ b/configure @@ -256,6 +256,7 @@ softmmu=3D"yes" linux_user=3D"" bsd_user=3D"" plugins=3D"$default_feature" +subdirs=3D"" ninja=3D"" python=3D download=3D"enabled" @@ -1067,6 +1068,9 @@ if test "$static" =3D "yes" ; then fi fi test "$plugins" =3D "" && plugins=3Dyes +if test "$plugins" =3D "yes"; then + subdirs=3D"$subdirs contrib/plugins" +fi =20 cat > $TMPC << EOF =20 @@ -1627,12 +1631,11 @@ done echo "# Automatically generated by configure - do not modify" > Makefile.p= rereqs =20 # Mac OS X ships with a broken assembler -roms=3D if have_target i386-softmmu x86_64-softmmu && \ test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ test "$targetos" !=3D "haiku" && \ probe_target_compiler i386-softmmu; then - roms=3D"pc-bios/optionrom" + subdirs=3D"$subdirs pc-bios/optionrom" config_mak=3Dpc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $confi= g_mak echo "TOPSRC_DIR=3D$source_path" >> $config_mak @@ -1641,7 +1644,7 @@ fi =20 if have_target ppc-softmmu ppc64-softmmu && \ probe_target_compiler ppc-softmmu; then - roms=3D"$roms pc-bios/vof" + subdirs=3D"$subdirs pc-bios/vof" config_mak=3Dpc-bios/vof/config.mak echo "# Automatically generated by configure - do not modify" > $confi= g_mak echo "SRC_DIR=3D$source_path/pc-bios/vof" >> $config_mak @@ -1660,7 +1663,7 @@ if have_target s390x-softmmu && probe_target_compiler= s390x-softmmu && \ echo "WARNING: Your compiler does not support the z900!" echo " The s390-ccw bios will only work with guest CPUs >=3D= z10." fi - roms=3D"$roms pc-bios/s390-ccw" + subdirs=3D"$subdirs pc-bios/s390-ccw" config_mak=3Dpc-bios/s390-ccw/config-host.mak echo "# Automatically generated by configure - do not modify" > $confi= g_mak echo "SRC_PATH=3D$source_path/pc-bios/s390-ccw" >> $config_mak @@ -1727,7 +1730,7 @@ if test "$container" !=3D no; then echo "ENGINE=3D$container" >> $config_host_mak echo "RUNC=3D$runc" >> $config_host_mak fi -echo "ROMS=3D$roms" >> $config_host_mak +echo "SUBDIRS=3D$subdirs" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak echo "MESON=3D$meson" >> $config_host_mak --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659962; cv=none; d=zohomail.com; s=zohoarc; b=WtSacyFe7ql3y/EKk+h/SsQ5fBBa62jIgu1D8D0bsIS5/Xi/MQUKX+g5b+/I4dTPc9E99Id7iAKUl3MQZi0d7HfSx7GHdh+0+3R2hwRlkdM/zAbOxa+yi7suo/87IWOd0No3M28/vmtHjuaFid7qIAsrIzcbzJ7Ms3vQ/BqSke8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659962; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WOrwIy0yVkkVCMdsR7pcN1939wIUsA1rDIy2bZn4zKg=; b=jEYuq5FAk8+F1bcY6Elz3Q5avHgdIw8S8cyknUQ/EA7Pk1ba7uvSHT9sdLlOrB2+Lm6m282ick8YjchtUrFQfyeWq5nJ5YcO7oe0J9aev7GqGb1P97LkoqXc0E3w5aNYdOaVHXSs9cW8GnbVW1aBUY2GW4G7WfMZ6Z2nwsIaZF4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659962972999.0519943923748; Sat, 2 Sep 2023 06:06:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEl-0001Nr-SB; Sat, 02 Sep 2023 09:00:27 -0400 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 1qcQER-0001Df-1R for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:07 -0400 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 1qcQEN-0001lk-3x for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:05 -0400 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-224-BUvs0fN8OD2tFFx4hQ3Z9w-1; Sat, 02 Sep 2023 08:59:58 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3fefea09bd0so18161605e9.0 for ; Sat, 02 Sep 2023 05:59:58 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d4-20020adfe884000000b0030ae53550f5sm8447134wrm.51.2023.09.02.05.59.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659602; 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=WOrwIy0yVkkVCMdsR7pcN1939wIUsA1rDIy2bZn4zKg=; b=XjJw7lyl11L8uK/FeqxXFatuzEif3vKiorybcsFDXGPlyuivJzFTe2h+ZNN1b/09edF/WD 1OW0e9LrVceMMmNRaunCKjAuscJeCg0wy7olO5gqLlVURNCATDQTJmZu3RzG0nSkiZuqz5 4jUMXtpMpCHZjEtfAfrYMhrVc7QGGwc= X-MC-Unique: BUvs0fN8OD2tFFx4hQ3Z9w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659597; x=1694264397; 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=WOrwIy0yVkkVCMdsR7pcN1939wIUsA1rDIy2bZn4zKg=; b=cOV5KELAz1/4H8pkzm51oC9LvY4rPkqnMXRFWmR21ajOOtQxNVbF8LsFxseLzC+K8J V3tFNGHV9qZblJ7IG5/AUXT0TeD+uZ8sflk7UfvtCpb9NTcJ3/E/onNr9nXMVdVnL4Le UbW8XCkHNu+4g7Az1ZvCnSxfhmfzbTHSBUbHAHZ4K+ko4kW/02RCWOu6EI7e5hq+fT9i 5G0oRCOP8JaHEqggxngOGOltX3eRX+AX3TZbK2j1A4SgJcTS51EZELKAcvia7fctzdAB ZhJ5UWcZ+lDyWrl3i8oz77RKPDvi4jxzQckaDb4Sz8N/zFkio2rGDIUFtAu3C2b8YAov 9G+w== X-Gm-Message-State: AOJu0YzM9u+b3ZyD3Bz+RZxIHn6yeNfex5WXAdIKY33uJYnJLUMZSuG6 IwcnmqpW4tf93liOAEysgkhPRdRHVcJNuyAR6EjSrO0G6G+l95+UZY0CnLu4LSdUB5wwfgSnHyf y9izeUjG8zz9WkPkgsNwHJD/CygO2zpG3rVXls22RGBAc+HAevFZW5rU9YJoiVfR7chcfbaTsif 4= X-Received: by 2002:a5d:68d2:0:b0:319:841c:ae7a with SMTP id p18-20020a5d68d2000000b00319841cae7amr4089169wrw.41.1693659596946; Sat, 02 Sep 2023 05:59:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIfKl6kw7XjonnU7JsG21Q5U1zFWyFD+lQJlwGbAn5C4tz+uZ1wmdeUsdg3qdeJmpymPCg2g== X-Received: by 2002:a5d:68d2:0:b0:319:841c:ae7a with SMTP id p18-20020a5d68d2000000b00319841cae7amr4089159wrw.41.1693659596560; Sat, 02 Sep 2023 05:59:56 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 11/15] configure, meson: move --enable-plugins to meson Date: Sat, 2 Sep 2023 14:59:30 +0200 Message-ID: <20230902125934.113017-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659963466100003 Content-Type: text/plain; charset="utf-8" While the option still needs to be parsed in the configure script (it's needed by tests/tcg, and also to decide about recursing into contrib/plugins), passing it to Meson can be done with -D instead of using config-host.mak. Signed-off-by: Paolo Bonzini --- accel/tcg/meson.build | 4 +++- configure | 5 +---- meson.build | 7 ++++--- meson_options.txt | 2 ++ plugins/meson.build | 12 +++++++----- scripts/meson-buildoptions.sh | 3 +++ tests/Makefile.include | 2 +- tests/meson.build | 6 ++---- 8 files changed, 23 insertions(+), 18 deletions(-) diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 166bef173b8..8ace7837079 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -11,7 +11,9 @@ tcg_ss.add(files( )) tcg_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c')) tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c')) -tcg_ss.add(when: 'CONFIG_PLUGIN', if_true: [files('plugin-gen.c')]) +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')) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss) diff --git a/configure b/configure index 9980eaeef57..017977f72b3 100755 --- a/configure +++ b/configure @@ -1712,10 +1712,6 @@ case $targetos in ;; esac =20 -if test "$plugins" =3D "yes" ; then - echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak -fi - if test -n "$gdb_bin"; then gdb_version=3D$($gdb_bin --version | head -n 1) if version_ge ${gdb_version##* } 9.1; then @@ -1906,6 +1902,7 @@ if test "$skip_meson" =3D no; then test "$cfi" !=3D false && meson_option_add "-Dcfi=3D$cfi" test "$docs" !=3D auto && meson_option_add "-Ddocs=3D$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" + test "$plugins" =3D yes && meson_option_add "-Dplugins=3Dtrue" test "$qemu_suffix" !=3D qemu && meson_option_add "-Dqemu_suffix=3D$qemu= _suffix" test "$smbd" !=3D '' && meson_option_add "-Dsmbd=3D$smbd" test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" diff --git a/meson.build b/meson.build index baf47613650..9100e2a9794 100644 --- a/meson.build +++ b/meson.build @@ -730,7 +730,7 @@ glib_cflags =3D [] if enable_modules gmodule =3D dependency('gmodule-export-2.0', version: glib_req_ver, requ= ired: true, method: 'pkg-config') -elif config_host.has_key('CONFIG_PLUGIN') +elif get_option('plugins') gmodule =3D dependency('gmodule-no-export-2.0', version: glib_req_ver, r= equired: true, method: 'pkg-config') else @@ -2115,6 +2115,7 @@ if numa.found() dependencies: numa)) endif config_host_data.set('CONFIG_OPENGL', opengl.found()) +config_host_data.set('CONFIG_PLUGIN', get_option('plugins')) config_host_data.set('CONFIG_RBD', rbd.found()) config_host_data.set('CONFIG_RDMA', rdma.found()) config_host_data.set('CONFIG_SAFESTACK', get_option('safe_stack')) @@ -3883,7 +3884,7 @@ endforeach =20 # Other build targets =20 -if 'CONFIG_PLUGIN' in config_host +if get_option('plugins') install_headers('include/qemu/qemu-plugin.h') endif =20 @@ -4156,7 +4157,7 @@ if config_all.has_key('CONFIG_TCG') else summary_info +=3D {'TCG backend': 'native (@0@)'.format(cpu)} endif - summary_info +=3D {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')} + summary_info +=3D {'TCG plugins': get_option('plugins')} summary_info +=3D {'TCG debug enabled': get_option('debug_tcg')} endif summary_info +=3D {'target list': ' '.join(target_dirs)} diff --git a/meson_options.txt b/meson_options.txt index 5d6b889554c..e48086e2562 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -83,6 +83,8 @@ option('xen_pci_passthrough', type: 'feature', value: 'au= to', description: 'Xen PCI passthrough support') option('tcg', type: 'feature', value: 'enabled', description: 'TCG support') +option('plugins', type: 'boolean', value: false, + description: 'TCG plugins via shared library loading') option('debug_tcg', type: 'boolean', value: false, description: 'TCG debugging') option('tcg_interpreter', type: 'boolean', value: false, diff --git a/plugins/meson.build b/plugins/meson.build index 752377c66d3..71ed996ed31 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -13,8 +13,10 @@ if not enable_modules endif endif =20 -specific_ss.add(when: 'CONFIG_PLUGIN', if_true: [files( - 'loader.c', - 'core.c', - 'api.c', -), declare_dependency(link_args: plugin_ldflags)]) +if get_option('plugins') + specific_ss.add(files( + 'loader.c', + 'core.c', + 'api.c', + ), declare_dependency(link_args: plugin_ldflags)) +endif diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 5567fd29985..6b16ad94f4b 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -40,6 +40,7 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-module-upgrades try to load modules from alter= nate paths for' printf "%s\n" ' upgrades' + printf "%s\n" ' --enable-plugins TCG plugins via shared library= loading' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u= )random and' printf "%s\n" ' getrandom()' printf "%s\n" ' --enable-safe-stack SafeStack Stack Smash Protecti= on (requires' @@ -401,6 +402,8 @@ _meson_option_parse() { --enable-pipewire) printf "%s" -Dpipewire=3Denabled ;; --disable-pipewire) printf "%s" -Dpipewire=3Ddisabled ;; --with-pkgversion=3D*) quote_sh "-Dpkgversion=3D$2" ;; + --enable-plugins) printf "%s" -Dplugins=3Dtrue ;; + --disable-plugins) printf "%s" -Dplugins=3Dfalse ;; --enable-png) printf "%s" -Dpng=3Denabled ;; --disable-png) printf "%s" -Dpng=3Ddisabled ;; --enable-pvrdma) printf "%s" -Dpvrdma=3Denabled ;; diff --git a/tests/Makefile.include b/tests/Makefile.include index 985cda7a945..38987426594 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -73,7 +73,7 @@ $(TCG_TESTS_TARGETS:%=3Ddistclean-tcg-tests-%): distclean= -tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) =20 .PHONY: check-tcg -.ninja-goals.check-tcg =3D all $(if $(CONFIG_PLUGIN),test-plugins) +.ninja-goals.check-tcg =3D all check-tcg: $(RUN_TCG_TARGET_RULES) =20 .PHONY: clean-tcg diff --git a/tests/meson.build b/tests/meson.build index 083f2990bde..c2528a88f99 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -80,10 +80,8 @@ if 'CONFIG_TCG' in config_all subdir('fp') endif =20 -if get_option('tcg').allowed() - if 'CONFIG_PLUGIN' in config_host - subdir('plugin') - endif +if get_option('plugins') + subdir('plugin') endif =20 subdir('unit') --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659664; cv=none; d=zohomail.com; s=zohoarc; b=RMCEJIEaNK/fsLZ/gZeKRuD/4gPcEcb2RFnLp7jgmfK9Jl/dMhuutyi51RIfyaGOwJZ/Iha7cW0btjIPvuXeepmHVb0VqL1PA+VRivlvM4mDAxAba8CQPJ3ZjsW+IQY5u5iDMuxVgriPkvKfiHY4JCLsOQemaqMJfJMgGH+oaTM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659664; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GENUN+wRZ+w6qH1+GNjgyBWTmZzTfEOkM7dN6ffdvWY=; b=bgApOGvJAFgYwUqLdYBkwUsgj80m6H9PPhHkTtVwe1AohQBkMrS6Jk/xLE3roDEpnlHIwM3I6Mpa4QFk5Gq1DeqExfTK7D5M6J3t+9fHh+A+qSo/Fh0g0jPdnfLEjikx7RUvxr0xTTlgg9C3p80GJH+cJNn0u0xJD6V79bELTQA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169365966475913.878038968330088; Sat, 2 Sep 2023 06:01:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEU-0001ED-Tr; Sat, 02 Sep 2023 09:00:14 -0400 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 1qcQEQ-0001Dd-RR for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:07 -0400 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 1qcQEM-0001kr-Jx for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:04 -0400 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-355-zETp8ISOO2CwuQBDFQTiQA-1; Sat, 02 Sep 2023 09:00:00 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-3f42bcef2acso20492065e9.2 for ; Sat, 02 Sep 2023 06:00:00 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id y11-20020a05600c20cb00b003fc02e8ea68sm10929549wmm.13.2023.09.02.05.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GENUN+wRZ+w6qH1+GNjgyBWTmZzTfEOkM7dN6ffdvWY=; b=XUyzosdjVN18ztXAg5F1gWJpTlghgQsxB5aeFrdEObrYtZ5KlJCUTYM02pWApAsBHNcDC4 Z0TfJUDXLBTaVthDS3h+mAh5zzHu7Fb+jTasbJII6tZq72mP4vtq+VimTHTW/tIgf7txmZ tzVIgKCq3sG1GbZDwrwOqnUWA6etKj8= X-MC-Unique: zETp8ISOO2CwuQBDFQTiQA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659598; x=1694264398; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GENUN+wRZ+w6qH1+GNjgyBWTmZzTfEOkM7dN6ffdvWY=; b=f0/Pk6E7gRAFMF7dsbXa6Gz8zCx9VSBXEBpC987SHkxntQahFOCfFkJm4TzYmcOoYm xttORenp6yg2GQfHlig6vvc8HhSo+Rqgi/OsT808rF73LjraF8X92uQm2dVjw+UbHkgE H9QG9eRqrXWB+fdrnKiu9C6KrnIYJNeid13irHchhgF0BeXfmI+I2cXWYAV8UFr8+0/A 0bWQdkG5UYkrPOajDJ9TdGns27iaUT7FDVmeyNDfRFk+dyjAHpzn7RSxMR3pxGmNA6Ld 9jwd06m7j9N5U6yvpXVmJ+Yput6FNnUmFf55cDCC0TRjzRMIBkkTFZd+/vsEa4XZENsX gS0A== X-Gm-Message-State: AOJu0Yy8yFoEikX/xKm2b8CiFoctn7sxIeVL0HY18ufecSLmCj3NFeOH TGlDflesWSANuTwT4nFgYmVYmo7nu33JCWL+kru1LVyzWF6n47YTc5bRAmsaSzUMARAkNO6v8FJ 6z7DPEtoK6YsqUhIBC3CszS1BR47h1U5EKnv9BWuEDESMOWial23MiVYHWVJhe+tAtt6iJtsuM7 4= X-Received: by 2002:a7b:ce92:0:b0:402:d72:bee5 with SMTP id q18-20020a7bce92000000b004020d72bee5mr3837027wmj.21.1693659598547; Sat, 02 Sep 2023 05:59:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyOZWUQWzp3l+xNebGo8+cKrT1f6Vl87nuhX9WTex0X0kYPrmAhoYDzGciewOFXzFACcg1lQ== X-Received: by 2002:a7b:ce92:0:b0:402:d72:bee5 with SMTP id q18-20020a7bce92000000b004020d72bee5mr3837020wmj.21.1693659598252; Sat, 02 Sep 2023 05:59:58 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH 12/15] configure, meson: remove CONFIG_SOLARIS from config-host.mak Date: Sat, 2 Sep 2023 14:59:31 +0200 Message-ID: <20230902125934.113017-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659665658100005 CONFIG_SOLARIS is only used to pick tap implementations. But the target OS is invariant and does not depend on the configuration, so move away from config_host and just use unconditional rules in softmmu_ss. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 3 --- meson.build | 1 + net/meson.build | 18 ++++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 017977f72b3..f3ffaca1878 100755 --- a/configure +++ b/configure @@ -1699,9 +1699,6 @@ if test "$targetos" =3D "darwin" ; then echo "CONFIG_DARWIN=3Dy" >> $config_host_mak fi =20 -if test "$targetos" =3D "sunos" ; then - echo "CONFIG_SOLARIS=3Dy" >> $config_host_mak -fi echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak =20 diff --git a/meson.build b/meson.build index 9100e2a9794..f6d079f4cda 100644 --- a/meson.build +++ b/meson.build @@ -2126,6 +2126,7 @@ if seccomp.found() config_host_data.set('CONFIG_SECCOMP_SYSRAWRC', seccomp_has_sysrawrc) endif config_host_data.set('CONFIG_SNAPPY', snappy.found()) +config_host_data.set('CONFIG_SOLARIS', targetos =3D=3D 'sunos') config_host_data.set('CONFIG_TPM', have_tpm) config_host_data.set('CONFIG_TSAN', get_option('tsan')) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) diff --git a/net/meson.build b/net/meson.build index bdf564a57b2..d2d70634e5e 100644 --- a/net/meson.build +++ b/net/meson.build @@ -41,15 +41,17 @@ if have_vhost_net_user system_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-user-stub.c')) endif =20 -system_ss.add(when: 'CONFIG_LINUX', if_true: files('tap-linux.c')) -system_ss.add(when: 'CONFIG_BSD', if_true: files('tap-bsd.c')) -system_ss.add(when: 'CONFIG_SOLARIS', if_true: files('tap-solaris.c')) -tap_posix =3D ['tap.c'] -if not config_host.has_key('CONFIG_LINUX') and not config_host.has_key('CO= NFIG_BSD') and not config_host.has_key('CONFIG_SOLARIS') - tap_posix +=3D 'tap-stub.c' +if targetos =3D=3D 'windows' + system_ss.add(files('tap-win32.c')) +elif targetos =3D=3D 'linux' + system_ss.add(files('tap.c', 'tap-linux.c')) +elif targetos in bsd_oses + system_ss.add(files('tap.c', 'tap-bsd.c')) +elif targetos =3D=3D 'solaris' + system_ss.add(files('tap.c', 'tap-solaris.c')) +else + system_ss.add(files('tap.c', 'tap-stub.c')) endif -system_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix)) -system_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c')) 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')) --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659967; cv=none; d=zohomail.com; s=zohoarc; b=QBSBa1SeDYS2DOZCvtsfdJyqPG3rNjS3PVKz7OmiCrTNuMaSyaUZhb59m/6PX8oiarr+9Z3oIZFRUiwad47woum4ZFivm87+dK18TDQumfAN2VFhKP2iXaj8VJ9XKqoSREmOCJVJij80vM+lobzXLvRAbDUSip7opGZltSTYrzo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659967; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I+Ir5xaBdiViIYuuEv81e7Jvg2/2x1hLSUNb3g8KVTw=; b=NspmLbAvlSF6h5j4LmzAX465GI42VaZKcdVsxSDXtHZHtOcfYuobWCuZISxvRi0XiVj7e6izsEX+yy/gJ3C7MXN21v44yPkHVN5NOPnv3d0WDSIVgyQrH2encyvTY42U7XI6jk1lwOKGc3V7iit4qvoWyO0CopfXG5/ypSEQdBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 169365996793196.76214428388971; Sat, 2 Sep 2023 06:06:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEo-0001OW-1G; Sat, 02 Sep 2023 09:00:30 -0400 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 1qcQEV-0001En-L6 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:15 -0400 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 1qcQEQ-0001we-9O for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:11 -0400 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-245-h7_eHbAoMgq878XlUCqMiw-1; Sat, 02 Sep 2023 09:00:02 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-3fe661c0323so18091895e9.0 for ; Sat, 02 Sep 2023 06:00:02 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id n26-20020a05600c3b9a00b00402c0a8a084sm2289110wms.17.2023.09.02.05.59.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659604; 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=I+Ir5xaBdiViIYuuEv81e7Jvg2/2x1hLSUNb3g8KVTw=; b=Zq67+1puqWvctQ0xT8K2277zier7IUnkP7xZDncFqYLDpujj9sv8cySN4ZQvOWKfz79xdz PDc4EKlmMdB4MAf57NGBGTG8HeQBz5QZLsCYBPds/4EgvLrRFumZ6jvGATiULYBKWrMkKr 7DlgZonX1svipfTfjQRbyenLxyZPuRA= X-MC-Unique: h7_eHbAoMgq878XlUCqMiw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659601; x=1694264401; 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=I+Ir5xaBdiViIYuuEv81e7Jvg2/2x1hLSUNb3g8KVTw=; b=B19rd103oduqRYYfzG3TKDhqiiu7NmmkfS4s66duJg8nxl6Mnvb3+3R8g/kJfK/KCP qqSIWlACGeNdjYUhprcEx5v4pLsrHpk/0C6nmaZsQ8ZoPgOYMiK12GRm96aDCZWiBlHi ogvrK2axenWFEUkeHWpd0xZ8FevRrpXJrr3FNRGjSfMxiCTWhiZL5617Cb72EJRqk4wx ICWFsTduWUamLGHnnEZTLg5vyWhNtq+Sv/d4l2c5ZVEEczI5wvhnXCOwjYUHVqW1cEL+ QIXi+MpCF1F/ovC3g+l7o85cYaUfSLb+h3Z9q6VYaHptAiNy/L+D4p53lfcZen4pCgiH 3nHA== X-Gm-Message-State: AOJu0YzATp/hsGPspgm/vxDPoncGyDsb+OJRHlRUR2vzcnynOPo/mCyg uzRLENRVjeqhnKmX/fSSwC3avcfOc0q7qYsoIhEGPcYyAtvTWV5a9qtlevIc5y81DmbmNg+x5+U 8i+9AHYxJoUj9NmNUwvKIlTA1c/WawMPTU58dXYE4QSZ0Q67e+KgEvviIlJkzV5bXH4Q64jNwEK g= X-Received: by 2002:a7b:c4c5:0:b0:3f6:9634:c8d6 with SMTP id g5-20020a7bc4c5000000b003f69634c8d6mr3680761wmk.18.1693659600620; Sat, 02 Sep 2023 06:00:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHJzeNIjcYg8xIM/u74mRUYN5l9LKJtvtDMiw4zUApLFggmxQ7fI9qIdhj1JaipstpPvJcNEQ== X-Received: by 2002:a7b:c4c5:0:b0:3f6:9634:c8d6 with SMTP id g5-20020a7bc4c5000000b003f69634c8d6mr3680749wmk.18.1693659600042; Sat, 02 Sep 2023 06:00:00 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 13/15] configure, meson: remove target OS symbols from config-host.mak Date: Sat, 2 Sep 2023 14:59:32 +0200 Message-ID: <20230902125934.113017-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659969904100005 Content-Type: text/plain; charset="utf-8" Stop applying config-host.mak to the sourcesets, since it does not have any more CONFIG_* symbols coming from the command line. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- chardev/meson.build | 2 +- configure | 18 ----------------- docs/devel/kconfig.rst | 2 +- gdbstub/meson.build | 4 ++-- meson.build | 40 +++++++++++++++++++++++++------------- qga/meson.build | 4 ++-- storage-daemon/meson.build | 2 +- tcg/meson.build | 2 +- tests/meson.build | 2 +- tests/qtest/meson.build | 12 ++++++------ tests/unit/meson.build | 6 +++--- 12 files changed, 46 insertions(+), 50 deletions(-) diff --git a/Makefile b/Makefile index 118c28e80d9..bfc4b2c8e92 100644 --- a/Makefile +++ b/Makefile @@ -313,7 +313,7 @@ endif @echo 'Documentation targets:' $(call print-help,html man,Build documentation in specified format) @echo '' -ifdef CONFIG_WIN32 +ifneq ($(filter msi, $(ninja-targets)),) @echo 'Windows targets:' $(call print-help,installer,Build NSIS-based installer for QEMU) $(call print-help,msi,Build MSI-based installer for qemu-ga) diff --git a/chardev/meson.build b/chardev/meson.build index fb630b429eb..6d56ad32fdb 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -26,7 +26,7 @@ chardev_ss.add(when: 'CONFIG_WIN32', if_true: files( 'char-win.c', )) =20 -chardev_ss =3D chardev_ss.apply(config_host, strict: false) +chardev_ss =3D chardev_ss.apply(config_targetos, strict: false) =20 system_ss.add(files( 'char-hmp-cmds.c', diff --git a/configure b/configure index f3ffaca1878..6404b659718 100755 --- a/configure +++ b/configure @@ -1683,32 +1683,14 @@ echo >> $config_host_mak echo all: >> $config_host_mak =20 if test "$targetos" =3D "windows"; then - echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO-Linux}" >> $config_host_mak echo "QEMU_GA_VERSION=3D${QEMU_GA_VERSION-$(cat "$source_path"/VERSION)}= " >> $config_host_mak -else - echo "CONFIG_POSIX=3Dy" >> $config_host_mak -fi - -if test "$targetos" =3D "linux" ; then - echo "CONFIG_LINUX=3Dy" >> $config_host_mak -fi - -if test "$targetos" =3D "darwin" ; then - echo "CONFIG_DARWIN=3Dy" >> $config_host_mak fi =20 echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak =20 -# XXX: suppress that -case $targetos in - gnu/kfreebsd | freebsd | dragonfly | netbsd | openbsd | darwin) - echo "CONFIG_BSD=3Dy" >> $config_host_mak - ;; -esac - if test -n "$gdb_bin"; then gdb_version=3D$($gdb_bin --version | head -n 1) if version_ge ${gdb_version##* } 9.1; then diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index e3a544e463f..73f52de1067 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -316,6 +316,6 @@ variable:: =20 host_kconfig =3D \ (have_tpm ? ['CONFIG_TPM=3Dy'] : []) + \ - ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=3Dy'] : []) + \ + (targetos =3D=3D 'linux' ? ['CONFIG_LINUX=3Dy'] : []) + \ (have_ivshmem ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ ... diff --git a/gdbstub/meson.build b/gdbstub/meson.build index 77762e0b3e1..9500b9dc4e6 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -14,8 +14,8 @@ gdb_system_ss =3D ss.source_set() gdb_user_ss.add(files('gdbstub.c', 'user.c')) gdb_system_ss.add(files('gdbstub.c', 'softmmu.c')) =20 -gdb_user_ss =3D gdb_user_ss.apply(config_host, strict: false) -gdb_system_ss =3D gdb_system_ss.apply(config_host, strict: false) +gdb_user_ss =3D gdb_user_ss.apply(config_targetos, strict: false) +gdb_system_ss =3D gdb_system_ss.apply(config_targetos, strict: false) =20 libgdb_user =3D static_library('gdb_user', gdb_user_ss.sources() + genh, diff --git a/meson.build b/meson.build index f6d079f4cda..d3feac656cb 100644 --- a/meson.build +++ b/meson.build @@ -2069,10 +2069,15 @@ 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_COCOA', cocoa.found()) +config_host_data.set('CONFIG_DARWIN', targetos =3D=3D '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 =3D=3D 'linux') +config_host_data.set('CONFIG_POSIX', targetos !=3D 'windows') +config_host_data.set('CONFIG_WIN32', targetos =3D=3D '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()) @@ -2799,6 +2804,15 @@ endif ######################## =20 minikconf =3D find_program('scripts/minikconf.py') +config_targetos =3D { + (targetos =3D=3D 'windows' ? 'CONFIG_WIN32' : 'CONFIG_POSIX'): 'y' +} +if targetos =3D=3D 'darwin' + config_targetos +=3D {'CONFIG_DARWIN': 'y'} +elif targetos =3D=3D 'linux' + config_targetos +=3D {'CONFIG_LINUX': 'y'} +endif + config_all =3D {} config_all_devices =3D {} config_all_disas =3D {} @@ -2842,7 +2856,7 @@ host_kconfig =3D \ (have_vhost_vdpa ? ['CONFIG_VHOST_VDPA=3Dy'] : []) + \ (have_vhost_kernel ? ['CONFIG_VHOST_KERNEL=3Dy'] : []) + \ (have_virtfs ? ['CONFIG_VIRTFS=3Dy'] : []) + \ - ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=3Dy'] : []) + \ + (targetos =3D=3D 'linux' ? ['CONFIG_LINUX=3Dy'] : []) + \ (have_pvrdma ? ['CONFIG_PVRDMA=3Dy'] : []) + \ (multiprocess_allowed ? ['CONFIG_MULTIPROCESS_ALLOWED=3Dy'] : []) + \ (vfio_user_server_allowed ? ['CONFIG_VFIO_USER_SERVER_ALLOWED=3Dy'] : []) @@ -2863,7 +2877,7 @@ foreach target : target_dirs endif config_target +=3D { 'CONFIG_LINUX_USER': 'y' } elif target.endswith('bsd-user') - if 'CONFIG_BSD' not in config_host + if targetos not in bsd_oses if default_targets continue endif @@ -2994,7 +3008,7 @@ target_dirs =3D actual_target_dirs # pseudo symbol replaces it. =20 config_all +=3D config_all_devices -config_all +=3D config_host +config_all +=3D config_targetos config_all +=3D config_all_disas config_all +=3D { 'CONFIG_XEN': xen.found(), @@ -3341,7 +3355,7 @@ if enable_modules modulecommon =3D declare_dependency(link_whole: libmodulecommon, compile= _args: '-DBUILD_DSO') endif =20 -qom_ss =3D qom_ss.apply(config_host, strict: false) +qom_ss =3D qom_ss.apply(config_targetos, strict: false) libqom =3D static_library('qom', qom_ss.sources() + genh, dependencies: [qom_ss.dependencies()], name_suffix: 'fa') @@ -3515,7 +3529,7 @@ foreach d, list : target_modules foreach target : target_dirs if target.endswith('-softmmu') config_target =3D config_target_mak[target] - config_target +=3D config_host + config_target +=3D config_targetos target_inc =3D [include_directories('target' / config_target['TA= RGET_BASE_ARCH'])] c_args =3D ['-DNEED_CPU_H', '-DCONFIG_TARGET=3D"@0@-config-target.h"'.format(targe= t), @@ -3576,7 +3590,7 @@ qemu_syms =3D custom_target('qemu.syms', output: 'qem= u.syms', capture: true, command: [undefsym, nm, '@INPUT@']) =20 -authz_ss =3D authz_ss.apply(config_host, strict: false) +authz_ss =3D authz_ss.apply(config_targetos, strict: false) libauthz =3D static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], name_suffix: 'fa', @@ -3585,7 +3599,7 @@ libauthz =3D static_library('authz', authz_ss.sources= () + genh, authz =3D declare_dependency(link_whole: libauthz, dependencies: qom) =20 -crypto_ss =3D crypto_ss.apply(config_host, strict: false) +crypto_ss =3D crypto_ss.apply(config_targetos, strict: false) libcrypto =3D static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], name_suffix: 'fa', @@ -3594,7 +3608,7 @@ libcrypto =3D static_library('crypto', crypto_ss.sour= ces() + genh, crypto =3D declare_dependency(link_whole: libcrypto, dependencies: [authz, qom]) =20 -io_ss =3D io_ss.apply(config_host, strict: false) +io_ss =3D io_ss.apply(config_targetos, strict: false) libio =3D static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], link_with: libqemuutil, @@ -3610,7 +3624,7 @@ migration =3D declare_dependency(link_with: libmigrat= ion, dependencies: [zlib, qom, io]) system_ss.add(migration) =20 -block_ss =3D block_ss.apply(config_host, strict: false) +block_ss =3D block_ss.apply(config_targetos, strict: false) libblock =3D static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), link_depends: block_syms, @@ -3621,7 +3635,7 @@ block =3D declare_dependency(link_whole: [libblock], link_args: '@block.syms', dependencies: [crypto, io]) =20 -blockdev_ss =3D blockdev_ss.apply(config_host, strict: false) +blockdev_ss =3D blockdev_ss.apply(config_targetos, strict: false) libblockdev =3D static_library('blockdev', blockdev_ss.sources() + genh, dependencies: blockdev_ss.dependencies(), name_suffix: 'fa', @@ -3630,7 +3644,7 @@ libblockdev =3D static_library('blockdev', blockdev_s= s.sources() + genh, blockdev =3D declare_dependency(link_whole: [libblockdev], dependencies: [block, event_loop_base]) =20 -qmp_ss =3D qmp_ss.apply(config_host, strict: false) +qmp_ss =3D qmp_ss.apply(config_targetos, strict: false) libqmp =3D static_library('qmp', qmp_ss.sources() + genh, dependencies: qmp_ss.dependencies(), name_suffix: 'fa', @@ -3645,7 +3659,7 @@ libchardev =3D static_library('chardev', chardev_ss.s= ources() + genh, =20 chardev =3D declare_dependency(link_whole: libchardev) =20 -hwcore_ss =3D hwcore_ss.apply(config_host, strict: false) +hwcore_ss =3D hwcore_ss.apply(config_targetos, strict: false) libhwcore =3D static_library('hwcore', sources: hwcore_ss.sources() + genh, name_suffix: 'fa', build_by_default: false) @@ -3702,7 +3716,7 @@ foreach target : target_dirs '-DCONFIG_DEVICES=3D"@0@-config-devices.h"'.format(target)] link_args =3D emulator_link_args =20 - config_target +=3D config_host + config_target +=3D config_targetos target_inc =3D [include_directories('target' / config_target['TARGET_BAS= E_ARCH'])] if targetos =3D=3D 'linux' target_inc +=3D include_directories('linux-headers', is_system: true) diff --git a/qga/meson.build b/qga/meson.build index dd18092f561..59cae0cc6ee 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -85,7 +85,7 @@ qga_ss.add(when: 'CONFIG_WIN32', if_true: files( 'vss-win32.c' )) =20 -qga_ss =3D qga_ss.apply(config_host, strict: false) +qga_ss =3D qga_ss.apply(config_targetos, strict: false) =20 gen_tlb =3D [] qga_libs =3D [] @@ -180,7 +180,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 'CONFIG_POSIX' in config_host +#if targetos !=3D 'windows' if false srcs =3D [files('commands-posix-ssh.c')] i =3D 0 diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index 49c9d2eac91..5e90cd32b40 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') =20 if have_tools - qsd_ss =3D qsd_ss.apply(config_host, strict: false) + qsd_ss =3D qsd_ss.apply(config_targetos, strict: false) qsd =3D executable('qemu-storage-daemon', qsd_ss.sources(), dependencies: qsd_ss.dependencies(), diff --git a/tcg/meson.build b/tcg/meson.build index c0252c41988..0014dca7d4f 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 =20 -tcg_ss =3D tcg_ss.apply(config_host, strict: false) +tcg_ss =3D tcg_ss.apply(config_targetos, strict: false) =20 libtcg_user =3D static_library('tcg_user', tcg_ss.sources() + genh, diff --git a/tests/meson.build b/tests/meson.build index c2528a88f99..debaa4505eb 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -68,7 +68,7 @@ test_deps =3D { 'test-qht-par': qht_bench, } =20 -if have_tools and have_vhost_user and 'CONFIG_LINUX' in config_host +if have_tools and have_vhost_user and targetos =3D=3D 'linux' executable('vhost-user-bridge', sources: files('vhost-user-bridge.c'), dependencies: [qemuutil, vhost_user]) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index c0751ef7c35..4a9b0267e50 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -38,8 +38,8 @@ qtests_cxl =3D \ # for the availability of the default NICs in the tests qtests_filter =3D \ (get_option('default_devices') and slirp.found() ? ['test-netfilter'] : = []) + \ - (get_option('default_devices') and config_host.has_key('CONFIG_POSIX') ?= ['test-filter-mirror'] : []) + \ - (get_option('default_devices') and config_host.has_key('CONFIG_POSIX') ?= ['test-filter-redirector'] : []) + (get_option('default_devices') and targetos !=3D 'windows' ? ['test-filt= er-mirror'] : []) + \ + (get_option('default_devices') and targetos !=3D 'windows' ? ['test-filt= er-redirector'] : []) =20 qtests_i386 =3D \ (slirp.found() ? ['pxe-test'] : []) + \ @@ -48,7 +48,7 @@ qtests_i386 =3D \ (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'] := []) + \ - (config_host.has_key('CONFIG_LINUX') and = \ + (targetos =3D=3D '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 =3D \ (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'] : []) = + \ - (config_host.has_key('CONFIG_POSIX') and = \ + (targetos !=3D '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 = \ @@ -275,7 +275,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_SERIAL') qos_test_ss.add(files('virtio-serial-test.c')) endif =20 -if config_host.has_key('CONFIG_POSIX') +if targetos !=3D 'windows' qos_test_ss.add(files('e1000e-test.c')) endif if have_virtfs @@ -308,7 +308,7 @@ qtests =3D { '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_host, strict: false).= sources()], + 'qos-test': [chardev, io, qos_test_ss.apply(config_targetos, strict: fal= se).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'], diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 93977cc32d2..0299ef6906c 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -98,7 +98,7 @@ if have_block } if gnutls.found() and \ tasn1.found() and \ - 'CONFIG_POSIX' in config_host + targetos !=3D 'windows' tests +=3D { 'test-crypto-tlscredsx509': ['crypto-tls-x509-helpers.c', 'pkix_asn1= _tab.c', tasn1, crypto, gnutls], @@ -113,7 +113,7 @@ if have_block if xts =3D=3D 'private' tests +=3D {'test-crypto-xts': [crypto, io]} endif - if 'CONFIG_POSIX' in config_host + if targetos !=3D 'windows' tests +=3D { 'test-image-locking': [testblock], 'test-nested-aio-poll': [testblock], @@ -148,7 +148,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 'CONFIG_POSIX' in config_host + if targetos !=3D 'windows' tests +=3D { 'test-char': ['socket-helpers.c', qom, io, chardev] } --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659919; cv=none; d=zohomail.com; s=zohoarc; b=clKchH7F1GScaLEQbnfDM7pAx9ATr6Vl6MvQBb5HQ7fSAOsbNyIprvSI2tHv+AfuwXKcEZVngtxO6DP1yA0bqd8C5AHZ+g+VJyzrivjO2vJaYbPxTJ/5c6xfg6uCn5l66q2qa7AJVTmhgklwxGJ8GHIEqn0CQlvdfv/zxdVqYOc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659919; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hdxMt1JWLcVMJ4q896LNcJMB3TzYb0uEnxCUsLKSwU4=; b=MoewNlmGQhwEmg80D689O2nCXaQO7Q0GEudgX5deivK2xUeF/8YAmSqmFcRNLFaOnPljMEp2CHuCNU937v8YVA9+5T6/qGXDhBoUojQLiP6XyD449NC+5ffN70YG0LN/6OQ9Uy9K5H023hRiK7ssLk0//xVeEIQkpgFFkFvjWgI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1693659919173793.2220107554051; Sat, 2 Sep 2023 06:05:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEm-0001Ns-AR; Sat, 02 Sep 2023 09:00:28 -0400 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 1qcQEV-0001El-1z for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:14 -0400 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 1qcQEQ-0001x7-NK for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:10 -0400 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-425-C0lsPNBVNUGh-HF92FIXVg-1; Sat, 02 Sep 2023 09:00:03 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-401d9abf21cso19541835e9.0 for ; Sat, 02 Sep 2023 06:00:02 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id c20-20020a7bc854000000b003fee0741b8csm10942924wml.23.2023.09.02.06.00.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 06:00:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659605; 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=hdxMt1JWLcVMJ4q896LNcJMB3TzYb0uEnxCUsLKSwU4=; b=W2jgxHUgfqaQWtChva06bkGGeP09qHel2jkWsi6rhlCFtVaWO1HuWZG0PcF+DkViD+/n2F htyJTjNQQKP2umJ+sTcm0fq9t/ri4Q2ByZqk6AOo76TGEyhhUWUwJR2EcANkWnNk24eoOx sDzpDVmkUOgWi2wbAwlserTks2Y1UtA= X-MC-Unique: C0lsPNBVNUGh-HF92FIXVg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659601; x=1694264401; 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=hdxMt1JWLcVMJ4q896LNcJMB3TzYb0uEnxCUsLKSwU4=; b=kfyJFF2DdU7RcjSFTYlzrrdi9SXHcArOElF325sifSpBG1dL2sBr8nJD8DW7q2yRvs +k6HpzLq287OiOHUt6yXFJ/hVT2rE+Y15FD/743tbAtj4o5f5iEGFeRYoekTW0CcxblK RB1Q0dkmXARrl2BfWJYHrYaz/gZIcJWoe7WppHDLcMX85Ui8B5b4vwqHpSW//0tIJhag k4BLaC7NgoIzjCZpNiEzgXJCgePKQ9Sbs54R/zqDxz1XF28MO1YVXl0Gw8VbKsMOqqdV nt6K6pQC7xveVYFGOdbDuhjTADsCFYwxZZxLMYMT85bg8eA8G17ByW1qPhjakpQHqtsn iBUg== X-Gm-Message-State: AOJu0YwAiuCjzEf1jU9JECNxVbJHp5LCwgvyIugO0jZhoQV71r20FHO/ 5BnD8JLcf6LWix8HpwVgiCqZRrMY88awLwW/28VVeTyeemaSvUl8gidCDfiK1yCYXEnj8cbyGO3 ULgmp+1PP6uPJa3PabTKyWIllQx0hS2ljasbxcnCuoRsxZL8ICUH4mM3xW2+n4PTMPsOHGnUoqr g= X-Received: by 2002:a05:600c:c3:b0:3fe:dcd0:2e10 with SMTP id u3-20020a05600c00c300b003fedcd02e10mr3956801wmm.17.1693659601714; Sat, 02 Sep 2023 06:00:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGYZ5R3cNHt6kY5K6aryXMPnryPjEZ421Gmt/xEWIMvymt7u2pJm7xo4Pb9HIdoa3tc677WEw== X-Received: by 2002:a05:600c:c3:b0:3fe:dcd0:2e10 with SMTP id u3-20020a05600c00c300b003fedcd02e10mr3956789wmm.17.1693659601317; Sat, 02 Sep 2023 06:00:01 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 14/15] meson: list leftover CONFIG_* symbols Date: Sat, 2 Sep 2023 14:59:33 +0200 Message-ID: <20230902125934.113017-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659920827100003 Content-Type: text/plain; charset="utf-8" There are no config-host.mak symbols anymore that are needed in config-host.h; the only symbols that are included in config_host_data via the foreach loop are: - CONFIG_DEFAULT_TARGETS, which is not used by C code. - CONFIG_TCG and CONFIG_TCG_INTERPRETER, which are not part of config-host.= mak So, list these two symbols explicitly. Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 8 ++------ meson.build | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 64efa26b905..0f990bb3e90 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -460,17 +460,13 @@ Built by configure: =20 ``config-host.mak`` When configure has determined the characteristics of the build host it - will write them to this file for use in ``Makefile`` and to a smaller - extent ``meson.build``. These include the paths to various tools and a - variety of ``CONFIG_*`` variables related to optionally enabled features. + will write the paths to various tools to this file, for use in ``Makefil= e`` + and to a smaller extent ``meson.build``. =20 ``config-host.mak`` is also used as a dependency checking mechanism. If = make sees that the modification timestamp on configure is newer than that on ``config-host.mak``, then configure will be re-run. =20 - The variables defined here apply to all QEMU - build outputs. - ``config-meson.cross`` =20 A Meson "cross file" (or native file) used to communicate the paths to diff --git a/meson.build b/meson.build index d3feac656cb..cde2b58b91e 100644 --- a/meson.build +++ b/meson.build @@ -691,7 +691,6 @@ if get_option('tcg').allowed() endif if get_option('tcg_interpreter') tcg_arch =3D 'tci' - config_host +=3D { 'CONFIG_TCG_INTERPRETER': 'y' } elif host_arch =3D=3D 'x86_64' tcg_arch =3D 'i386' elif host_arch =3D=3D 'ppc64' @@ -701,7 +700,6 @@ if get_option('tcg').allowed() language: all_languages) =20 accelerators +=3D 'CONFIG_TCG' - config_host +=3D { 'CONFIG_TCG': 'y' } endif =20 if 'CONFIG_KVM' not in accelerators and get_option('kvm').enabled() @@ -2132,6 +2130,10 @@ if seccomp.found() endif config_host_data.set('CONFIG_SNAPPY', snappy.found()) config_host_data.set('CONFIG_SOLARIS', targetos =3D=3D 'sunos') +if get_option('tcg').allowed() + config_host_data.set('CONFIG_TCG', 1) + config_host_data.set('CONFIG_TCG_INTERPRETER', tcg_arch =3D=3D 'tci') +endif config_host_data.set('CONFIG_TPM', have_tpm) config_host_data.set('CONFIG_TSAN', get_option('tsan')) config_host_data.set('CONFIG_USB_LIBUSB', libusb.found()) @@ -2760,12 +2762,6 @@ if targetos =3D=3D 'windows' and 'cpp' in all_langua= ges endif config_host_data.set('HAVE_VSS_SDK', have_vss_sdk) =20 -foreach k, v: config_host - if k.startswith('CONFIG_') - config_host_data.set(k, v =3D=3D 'y' ? 1 : v) - endif -endforeach - # Older versions of MinGW do not import _lock_file and _unlock_file proper= ly. # This was fixed for v6.0.0 with commit b48e3ac8969d. if targetos =3D=3D 'windows' --=20 2.41.0 From nobody Wed May 15 04:51:59 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1693659994; cv=none; d=zohomail.com; s=zohoarc; b=mzpJ8Alz5PDXY2NsVVO7OdUjwHEzcUIpxeb+8XllI68zqmR5zeYjzjYxuxUdzuYReovErYZo+1FVg23lKMHNRy5/GDyUIl2LIg3z4nIPvrQieys4xVQcLA9M4DRwYZk7Gj5Raj8uMZZFeK/qDuvFwnVkZtv9q2yyECHrqPiG0Yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659994; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4WcGDl6RkhTkBJqOx8dimnwDWVGbWEwjjaYfS1PTpFo=; b=g0iNtnZTpg6uLHiIY1bvVbj3m5d0ae1BrJmwEHXunZD0a0H1M4IcxJ0znh1XBH1g0VvRMkTozoFIjhrLjn1kMG5kn5diVpH3YBpph+T/1/0SJJUmalYx4JJCuGNOrAFsCnQiK4fjqftHmZOpXOdzx9Gw94o5fdR9PiV1zY8h5iw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16936599940124.833849008968741; Sat, 2 Sep 2023 06:06:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEn-0001OP-9z; Sat, 02 Sep 2023 09:00:29 -0400 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 1qcQEV-0001Em-2i for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:15 -0400 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 1qcQEQ-0001x9-Us for qemu-devel@nongnu.org; Sat, 02 Sep 2023 09:00:10 -0400 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-683-XiQW7mQ6NguceJLlpNJmlA-1; Sat, 02 Sep 2023 09:00:04 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-31400956ce8so1523183f8f.3 for ; Sat, 02 Sep 2023 06:00:04 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id g7-20020a5d46c7000000b0031accc7228asm8443093wrs.34.2023.09.02.06.00.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 06:00:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659606; 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=4WcGDl6RkhTkBJqOx8dimnwDWVGbWEwjjaYfS1PTpFo=; b=i5UY3C0RuR11MzzEDAv9RQ0JdPNsxG5P0VhLYt+nEye5IRdWB3MxsU5FX9IRbFqJO3cXDN kKv9DQEDcZ/68RwfBbqSKLeVmZVcrkx6J59I9ojP9/aW9IM7h+MVwEkZkiREqjy8Ps+6uZ Yyp1aLg9Me3d2OdiINbTqgw5pg32EqY= X-MC-Unique: XiQW7mQ6NguceJLlpNJmlA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659603; x=1694264403; 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=4WcGDl6RkhTkBJqOx8dimnwDWVGbWEwjjaYfS1PTpFo=; b=KqWGZHs5+lK2+UsoFQZvn6+2oisPqMhBmp0CslnsgizI2o2NPYO6M6FuwPOUJZI6vE UOVQgzSIhqNiM6MU8h9DuV9C+iI10Mix1OFY/fMPSkwPnUPlX5Jn3ASWuHCiMHVoUasb e4JaZov6M0OL/wRNXKi3ldzUaY6qDCv0DUj37pdS7/AVtXXu/GkwCsI8MJ+uk2g690li w29djg6iIeJHVz76FJK89sfhGg7XhyrPvsMxnx5/jCzXNUqfNMQegSMUiVEetgUmXOrO kb2IqJtClbutTckzXznPHlY4eQEuto2e/UvRYFiS1F6bPMJktKnjw34y+r3KqHPno6N3 oe0g== X-Gm-Message-State: AOJu0YyxTIqZ01+akgNnRH0Ex2LcO8MO8nKgcfGq0eoV03U9BvGOg3Tk FDjA62yptjpstZUf7U9uTrtiduHoxaoMsiy78QXEdv8ZKHuYcFMXAvAY3POY9Cqa/MQ5WKhKg/R uVKh2//BBwVA35FhsufD2mv0GIQzJITNp29mLIsSi9v67d69bYcWef5BnhQHJIaefK6CcQId3yY c= X-Received: by 2002:a05:6000:82:b0:31d:cd2f:4a4b with SMTP id m2-20020a056000008200b0031dcd2f4a4bmr3460736wrx.50.1693659603150; Sat, 02 Sep 2023 06:00:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFNO0Z1oguqNDY7xj3vr1LGrnZH/BSf58pU72nTu7U+f+H+OjM4w2YkPQP8Mdrqby/dh3BT8Q== X-Received: by 2002:a05:6000:82:b0:31d:cd2f:4a4b with SMTP id m2-20020a056000008200b0031dcd2f4a4bmr3460732wrx.50.1693659602896; Sat, 02 Sep 2023 06:00:02 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 15/15] configure: remove dead code Date: Sat, 2 Sep 2023 14:59:34 +0200 Message-ID: <20230902125934.113017-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659995057100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- configure | 8 -------- 1 file changed, 8 deletions(-) diff --git a/configure b/configure index 6404b659718..a8d79602098 100755 --- a/configure +++ b/configure @@ -1126,14 +1126,6 @@ else done fi =20 -# see if system emulation was really requested -case " $target_list " in - *"-softmmu "*) softmmu=3Dyes - ;; - *) softmmu=3Dno - ;; -esac - if test "$tcg" =3D "auto"; then if test -z "$target_list"; then tcg=3D"disabled" --=20 2.41.0