From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130936364491.8396277613365; Thu, 28 Apr 2022 00:28:56 -0700 (PDT) Received: from localhost ([::1]:37136 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njya2-000572-4H for importer@patchew.org; Thu, 28 Apr 2022 03:28:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy20-0008Vv-Va for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:41 -0400 Received: from mail-ed1-x52d.google.com ([2a00:1450:4864:20::52d]:44806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy1z-00054u-AU for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:40 -0400 Received: by mail-ed1-x52d.google.com with SMTP id e23so4381312eda.11 for ; Wed, 27 Apr 2022 23:53:38 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8FmLaIa8GYANcisBi9dnMAUzKkNvik7or0XA37is0A0=; b=jeDOrqc3fvECGqvemYdwLfQPp4vmHHwPOOf0ZkouefoB+64bUtY73MYrndOxA4RbAI aRHwaBtZXRx6muNk7UTf189tXuF5x9ENYy28rKOoIv0naowPxcSZp3CdMNeyLdqg8wgR k5QbuExTqutkk1Uh1CbG0PsZJ01f+7N7+ZtNj52OWsRTP5NpPgQlBsxXjQrZQB0NJGaC T5ySUAe2a/+A1x+6YvYkfjaHPEo9M7U4csJBuMTxIGUD1XZygi6dGg2tOkMCj3Z8CroD OJJzElCJTwYj1vH1hug3wEIOzctLYQ7vW5u/Hz8NZX3daSVnR0NGNVCJlyloqXkoWP8o 31Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8FmLaIa8GYANcisBi9dnMAUzKkNvik7or0XA37is0A0=; b=QB3/uP+LYDeho0ry0QJh+J2k0YW9Nn2bUtd7UOuHVgAVFwVjnIVupThCF2gsUgGhes d5jQzZCmil3kB+nEjMnPnVFogqH3v5ibBIcEnYMYr57aHORZIDNY2K+3n1Em/QHzSgZC HDiEP2dSRUqQczFHG9GEGy/t1+FnOYp0SrxDACjxvWmuN3JUyCfPiU1wtmQQVO/AeW6V FFy68TRQ+mXS+47So8Ow7Y5mTP1AVBu/FaCI+HKoVQQqrln3+9AvnQZJ1ENImF4/RTkt P50F8HZW9aAJSl7S8vBUrVyK4Wq6Va2MYYBgaKH+88pVPxta22Lh1ajfAwtawriQ7Opf nWBA== X-Gm-Message-State: AOAM532qkq2k5EjPdJtpcuv7P+0RMNFmKdqZZ/HFzMA7UbypCeDYWfmn MVm1MpejJVScMfIle2x6h7zaddUm+5ftHA== X-Google-Smtp-Source: ABdhPJx22uIqjkpganHYkpfn9Vi9tr4ElR9T0c+2SiJBWsOuYQH69v7aCgmo9DzNqPBknNTuS7o/0w== X-Received: by 2002:aa7:d609:0:b0:425:d94b:4119 with SMTP id c9-20020aa7d609000000b00425d94b4119mr23746612edr.282.1651128817744; Wed, 27 Apr 2022 23:53:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/18] error-report: fix g_date_time_format assertion Date: Thu, 28 Apr 2022 08:53:18 +0200 Message-Id: <20220428065335.189795-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Haiyue Wang , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130937577100001 From: Haiyue Wang The 'g_get_real_time' returns the number of microseconds since January 1, 1970 UTC, but 'g_date_time_new_from_unix_utc' needs the number of seconds, so it will cause the invalid time input: (process:279642): GLib-CRITICAL (recursed) **: g_date_time_format: assertio= n 'datetime !=3D NULL' failed Call function 'g_date_time_new_now_utc' instead, it has the same result as 'g_date_time_new_from_unix_utc(g_get_real_time() / G_USEC_PER_SEC)'; Fixes: 73dab893b569 ("error-report: replace deprecated g_get_current_time()= with glib >=3D 2.62") Signed-off-by: Haiyue Wang Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <20220424105036.291370-1-haiyue.wang@intel.com> --- util/error-report.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/error-report.c b/util/error-report.c index dbadaf206d..5edb2e6040 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -173,7 +173,7 @@ static char * real_time_iso8601(void) { #if GLIB_CHECK_VERSION(2,62,0) - g_autoptr(GDateTime) dt =3D g_date_time_new_from_unix_utc(g_get_real_t= ime()); + g_autoptr(GDateTime) dt =3D g_date_time_new_now_utc(); /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 = */ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130568326652.4649599284842; Thu, 28 Apr 2022 00:22:48 -0700 (PDT) Received: from localhost ([::1]:58190 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyUB-00088i-0e for importer@patchew.org; Thu, 28 Apr 2022 03:22:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51014) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy21-00005I-I8 for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:41 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:43629) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy1z-00054z-VA for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:41 -0400 Received: by mail-ed1-x530.google.com with SMTP id b24so4377081edu.10 for ; Wed, 27 Apr 2022 23:53:39 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8NgOW6LYaLZurNiIrzAPcuPOivSFBpwaLVQJFdNQLFQ=; b=FRpKhy+C13OJM1YYkVfykg84CvAf2YWzW6GL6/PxMuNqEF3xRc1Or/WSvZuuclDTe+ bw3dCAUou/djnY/i9ZHdRq4VYF/e8+bIQLR9jbEkCy5ZVCHDNMqW3ecaGTHv4f0uHbQr NVbj7SIBFKTU22lWLr3iO0TdNgaxV9VkusCq8PNrXGylyl3RCeCOdtYpEelDY8Fx/8VN JhmCGiW2aGLbQ2DzqMIRYCdF4n5jbIkHG4NVFmJL4QCOm/U2zPuqU1kE2H+p0JBaw2l2 9g0jFmQiUuiq1Y0uNza0KG6Kd/OQeMEphoiq5d7rB1CNC2i2aSPjMSqYeCGCctQ4FD0A FjwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8NgOW6LYaLZurNiIrzAPcuPOivSFBpwaLVQJFdNQLFQ=; b=LnuvzI16Od1mNhZJ3os8FUyvosaRDUFN7oW+i626Ow22SBlWhIjr21nG6MitjTMcYz uesB+4n6UX6+GmpvdRZU/tmbygE6FGoavx2/ElFdCp5+WZjDLGPwB8NwjP/BbxABSPET B8HTB6EmxAp+1fpZQf/C1+vEr4KIOFwnwuIfvfqEZA0/p+muDJnRx6jFrZZrAVELAOss wy2sGxrdt8Ql7mX20rOmRv8XnrKThPMLdP5rgggl1+XtC/QFDFHzvE4ByNvxao8W/aMk rwpZODkpI0XvwYhJgLCSD7VUsZXtDkuyUzGZQcx2ORMGzRSyF8+Nv91G151fPrw2FnzD e6XA== X-Gm-Message-State: AOAM531HzLT75RPaBsT47tulVSBvnnjlVI470NDlRgQoNrTLZ8QmKcI+ BVwLPFTIBtAegMB35bI3oUIzo7jvFjUbWg== X-Google-Smtp-Source: ABdhPJwXfuEmRDQQIgfP0bWaaj/5FWo4k0KmLiB3XbBFygRsR0VKv6jOdzDMi6WZY7LC95Xiol3trw== X-Received: by 2002:a05:6402:330b:b0:425:eded:7cfe with SMTP id e11-20020a056402330b00b00425eded7cfemr18948855eda.357.1651128818667; Wed, 27 Apr 2022 23:53:38 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/18] configure: make fortify_source=yes by default Date: Thu, 28 Apr 2022 08:53:19 +0200 Message-Id: <20220428065335.189795-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-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=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Michael Tokarev Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130570356100001 Content-Type: text/plain; charset="utf-8" From: Michael Tokarev Commit c87ea1163111917 "configure: add --without-default-feature" changed fortify_source from "yes" to "$default_feature". But there's no option to turn it on, we only turn it off for debug build. I think this should always be initialized to "yes" in the first place. Signed-off-by: Michael Tokarev Message-Id: <20220422100825.3692002-1-mjt@msgid.tls.msk.ru> Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index e8786d478e..a4942c13e4 100755 --- a/configure +++ b/configure @@ -308,7 +308,7 @@ debug_tcg=3D"no" debug=3D"no" sanitizers=3D"no" tsan=3D"no" -fortify_source=3D"$default_feature" +fortify_source=3D"yes" gcov=3D"no" EXESUF=3D"" modules=3D"no" --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130692012985.7444133565374; Thu, 28 Apr 2022 00:24:52 -0700 (PDT) Received: from localhost ([::1]:60404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyWA-0001Nq-Vn for importer@patchew.org; Thu, 28 Apr 2022 03:24:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51036) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy22-000090-O4 for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:42 -0400 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:36763) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy20-000555-TQ for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:42 -0400 Received: by mail-ed1-x533.google.com with SMTP id a1so4401603edt.3 for ; Wed, 27 Apr 2022 23:53:40 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oacl5zBrDKP+vkk8XImtvnuzIDKCJChcNYTiCEt2Cts=; b=ZiY8siyYfC74M+VpRrcugBiSp5Ef4eoU1NwLaeiIfugnUZHhazb0qehj/UmwPjxnDg x4lDPZkodaO7i4jO33vgJ7c6si9cO6vj1M5fo+8ammhfMtuoZt+j17jneChOMeRzVipa RjqIzge8J7RbeBEtd1IMLOs7I+yKWDHEe4ZjnjAKCuygxdMt7yaSwCu/bXxdfyXN1r7P 4vhnsI+265Cjgd6gyYbV1jilWhMtyaZ1Y9d1WAibzpoxxVADIfB8GRdcW9qjMj43tRr5 qJM5PU/2djyqtPlsVXsCOZatkl3JjFlbPpu1cG9oueeliD0nN/fo4ca5sZBpKpJcgmwH pxug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oacl5zBrDKP+vkk8XImtvnuzIDKCJChcNYTiCEt2Cts=; b=ISr1/ShAFjsxyqjJFMzoDBwV+kNfd5PPhALn3nLhL/NBJ4JBJXvBNJhxfJci0mZhvu TcGOqZc1G49Y21PA1FEHhGT9+h9kz+LNGfndpqwbsReprS1j3+U/meHnLW7s/XFKMhpt 5w7kMoNRHe4qYhaH8nkD3w4f+8kT+DTF6ZWOgNdJSucksyHYrIdeCqXKH9PwtSZP61NZ cpSGLsFLDT+WEObcAUUQXLjG2+DxTfbOz3/8O3c8qVIseXnlXT/etnOyacM+fLX0LcsN jDvl5w4Nf4js9OgvI7IW/816q9ERN4BQLOByRSznwmwsOYIzW0HREw6sfiLWY9cbHjIK r9mg== X-Gm-Message-State: AOAM530Ht8fdRD49/l0HmpsJw5OjKOOw0JtMsDSeOZO6zFkzbH/h3++U erX2qZbSl844SDYr12bB3Aluc8P3REm3Qw== X-Google-Smtp-Source: ABdhPJz43YKrQK4ittzQwq8g1EHvq0wNMGB5tD8hi+FcA5lUnkRthlVGIBQYTMcMUH2GhWnRc6te6w== X-Received: by 2002:a05:6402:26c5:b0:425:f7f0:fb6c with SMTP id x5-20020a05640226c500b00425f7f0fb6cmr14570282edd.133.1651128819457; Wed, 27 Apr 2022 23:53:39 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/18] remove -writeconfig Date: Thu, 28 Apr 2022 08:53:20 +0200 Message-Id: <20220428065335.189795-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-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=2a00:1450:4864:20::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130694049100001 Content-Type: text/plain; charset="utf-8" Like -set and -readconfig, it would not really be too hard to extend -writeconfig to parsing mechanisms other than QemuOpts. However, the uses of -writeconfig are substantially more limited, as it is generally easier to write the configuration by hand in the first place. In addition, -writeconfig does not even try to detect cases where it prints incorrect syntax (for example if values have a quote in them, since qemu_config_parse does not support any kind of escaping. Just remove it. Signed-off-by: Paolo Bonzini Message-Id: <20220414145721.326866-1-pbonzini@redhat.com> Signed-off-by: Paolo Bonzini --- docs/about/deprecated.rst | 7 ------ docs/about/removed-features.rst | 7 ++++++ include/qemu/config-file.h | 1 - qemu-options.hx | 8 ++----- softmmu/vl.c | 20 ---------------- util/qemu-config.c | 42 --------------------------------- 6 files changed, 9 insertions(+), 76 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 257cc15f82..896e5a97ab 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -67,13 +67,6 @@ and will cause a warning. The replacement for the ``nodelay`` short-form boolean option is ``nodelay= =3Don`` rather than ``delay=3Doff``. =20 -``-writeconfig`` (since 6.0) -''''''''''''''''''''''''''''' - -The ``-writeconfig`` option is not able to serialize the entire contents -of the QEMU command line. It is thus considered a failed experiment -and deprecated, with no current replacement. - Userspace local APIC with KVM (x86, since 6.0) '''''''''''''''''''''''''''''''''''''''''''''' =20 diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.= rst index 7c37dc2bda..4a0b270296 100644 --- a/docs/about/removed-features.rst +++ b/docs/about/removed-features.rst @@ -348,6 +348,13 @@ or ``gnutls`` library enabled as a cryptography provid= er. Neither the ``nettle`` library, or the built-in cryptography provider are supported on FIPS enabled hosts. =20 +``-writeconfig`` (removed in 7.1) +''''''''''''''''''''''''''''''''' + +The ``-writeconfig`` option was not able to serialize the entire contents +of the QEMU command line. It is thus considered a failed experiment +and removed without a replacement. + QEMU Machine Protocol (QMP) commands ------------------------------------ =20 diff --git a/include/qemu/config-file.h b/include/qemu/config-file.h index f605423321..321e7c7c03 100644 --- a/include/qemu/config-file.h +++ b/include/qemu/config-file.h @@ -12,7 +12,6 @@ void qemu_add_opts(QemuOptsList *list); void qemu_add_drive_opts(QemuOptsList *list); int qemu_global_option(const char *str); =20 -void qemu_config_write(FILE *fp); int qemu_config_parse(FILE *fp, QemuOptsList **lists, const char *fname, Error **errp); =20 diff --git a/qemu-options.hx b/qemu-options.hx index 1764eebfaf..bc196808ae 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4622,18 +4622,14 @@ SRST ERST =20 DEF("readconfig", HAS_ARG, QEMU_OPTION_readconfig, - "-readconfig \n", QEMU_ARCH_ALL) + "-readconfig \n" + " read config file\n", QEMU_ARCH_ALL) SRST ``-readconfig file`` Read device configuration from file. This approach is useful when you want to spawn QEMU process with many command line options but you don't want to exceed the command line character limit. ERST -DEF("writeconfig", HAS_ARG, QEMU_OPTION_writeconfig, - "-writeconfig \n" - " read/write config file (deprecated)\n", QEMU_ARCH_ALL) -SRST -ERST =20 DEF("no-user-config", 0, QEMU_OPTION_nouserconfig, "-no-user-config\n" diff --git a/softmmu/vl.c b/softmmu/vl.c index 06a0e342fe..c2919579fd 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3551,26 +3551,6 @@ void qemu_init(int argc, char **argv, char **envp) display_remote++; break; #endif - case QEMU_OPTION_writeconfig: - { - FILE *fp; - warn_report("-writeconfig is deprecated and will go aw= ay without a replacement"); - if (strcmp(optarg, "-") =3D=3D 0) { - fp =3D stdout; - } else { - fp =3D fopen(optarg, "w"); - if (fp =3D=3D NULL) { - error_report("open %s: %s", optarg, - strerror(errno)); - exit(1); - } - } - qemu_config_write(fp); - if (fp !=3D stdout) { - fclose(fp); - } - break; - } case QEMU_OPTION_qtest: qtest_chrdev =3D optarg; break; diff --git a/util/qemu-config.c b/util/qemu-config.c index 436ab63b16..433488aa56 100644 --- a/util/qemu-config.c +++ b/util/qemu-config.c @@ -314,48 +314,6 @@ void qemu_add_opts(QemuOptsList *list) abort(); } =20 -struct ConfigWriteData { - QemuOptsList *list; - FILE *fp; -}; - -static int config_write_opt(void *opaque, const char *name, const char *va= lue, - Error **errp) -{ - struct ConfigWriteData *data =3D opaque; - - fprintf(data->fp, " %s =3D \"%s\"\n", name, value); - return 0; -} - -static int config_write_opts(void *opaque, QemuOpts *opts, Error **errp) -{ - struct ConfigWriteData *data =3D opaque; - const char *id =3D qemu_opts_id(opts); - - if (id) { - fprintf(data->fp, "[%s \"%s\"]\n", data->list->name, id); - } else { - fprintf(data->fp, "[%s]\n", data->list->name); - } - qemu_opt_foreach(opts, config_write_opt, data, NULL); - fprintf(data->fp, "\n"); - return 0; -} - -void qemu_config_write(FILE *fp) -{ - struct ConfigWriteData data =3D { .fp =3D fp }; - QemuOptsList **lists =3D vm_config_groups; - int i; - - fprintf(fp, "# qemu config file\n\n"); - for (i =3D 0; lists[i] !=3D NULL; i++) { - data.list =3D lists[i]; - qemu_opts_foreach(data.list, config_write_opts, &data, NULL); - } -} - /* Returns number of config groups on success, -errno on error */ static int qemu_config_foreach(FILE *fp, QEMUConfigCB *cb, void *opaque, const char *fname, Error **errp) --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131205154456.38803683870583; Thu, 28 Apr 2022 00:33:25 -0700 (PDT) Received: from localhost ([::1]:45420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyeR-0002d8-U2 for importer@patchew.org; Thu, 28 Apr 2022 03:33:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy23-00009w-5w for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:43 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:37424) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy21-00055H-KK for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:42 -0400 Received: by mail-ej1-x636.google.com with SMTP id kq17so7615699ejb.4 for ; Wed, 27 Apr 2022 23:53:41 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AIc19+y8HXbEpfZV0NlYI8Ahv11lPhhftoNUYmFxI/A=; b=j2EfPN6uNHAgzyaKvWDOmJEqcnuC5lVZNWnlhG5EZbPhrT+J8sm/GK0jGgHqKs4URw WMvxgs503qXy3FSvCQ+1IA5tKcORd+7EmEQ91r+60Zv/VSpCxF/iDT+ftGOB/QmUOWGC sbv+PFzDk3Ki4ez5EQibp/yN8yn4bP06vP1d0fHGFVrl5bY67Tj/Ll8f0befMnQTz6z/ bUExuRU0OU41hmcJb8bSZcEgTpba5/zoPFcMVRItw8WGjKbK3+zfHtI2wYcc/jm5GdI7 cci++iF6xCrCG7xq2L26CweL350Nqi76USK9U0jJTHdOvkyA2QFklBnCs2oHgsPFMU8Q teaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=AIc19+y8HXbEpfZV0NlYI8Ahv11lPhhftoNUYmFxI/A=; b=u+0lJSR8nu5Bfdm3dVN4nuyIG5L+6TR47MlguG4/9VU+i4ywor2sbc3cNCCRX5UoMn ZGtc4KqrAUZ4XTt38Asc9YCoHqBsmoADovOS4G/QvDJGTfopFSlJv8xGH6aad1ZZ3H+r mgovtuNb5MnRCFGV9GBsuqbq7pbXzaMoea+Q+drC5PKNUD4XlYZY2PcSibOGju9hftU7 8VeR9exvv6XVdr2trLw2sBIy8LIUY3BE2KZK0RHjbtEo5+fob3FFfBesQP9MMzIlTEcL RW64K1CK3I2RGOEohmNWHR3eVScQvDzFj9YWNy/+6belt45WniRqrIiyG/PyUFA9+fLe VMiw== X-Gm-Message-State: AOAM531juWWGapiF/D1bzm3Bab+p+IVmCz1QQMrBfzI9KinOgFJDnK97 FS739f0vXPbSUAO/MlCW5jKEcCf8ZwS/BA== X-Google-Smtp-Source: ABdhPJwNQhRgDb66fRz0MbVhAn8eXAVdcyV0v1v6Qhjcls37WFUkVDCfHJB6oQOIj+h4MG1ffdoKJg== X-Received: by 2002:a17:907:608f:b0:6f3:891d:ccb0 with SMTP id ht15-20020a170907608f00b006f3891dccb0mr21113920ejc.750.1651128820214; Wed, 27 Apr 2022 23:53:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/18] i386: pcmpestr 64-bit sign extension bug Date: Thu, 28 Apr 2022 08:53:21 +0200 Message-Id: <20220428065335.189795-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-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=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Paul Brook Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131206030100001 Content-Type: text/plain; charset="utf-8" From: Paul Brook The abs1 function in ops_sse.h only works sorrectly when the result fits in a signed int. This is fine most of the time because we're only dealing with byte sized values. However pcmp_elen helper function uses abs1 to calculate the absolute value of a cpu register. This incorrectly truncates to 32 bits, and will give the wrong anser for the most negative value. Fix by open coding the saturation check before taking the absolute value. Signed-off-by: Paul Brook Signed-off-by: Paolo Bonzini --- target/i386/ops_sse.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/target/i386/ops_sse.h b/target/i386/ops_sse.h index e4d74b814a..535440f882 100644 --- a/target/i386/ops_sse.h +++ b/target/i386/ops_sse.h @@ -2011,25 +2011,23 @@ SSE_HELPER_Q(helper_pcmpgtq, FCMPGTQ) =20 static inline int pcmp_elen(CPUX86State *env, int reg, uint32_t ctrl) { - int val; + target_long val, limit; =20 /* Presence of REX.W is indicated by a bit higher than 7 set */ if (ctrl >> 8) { - val =3D abs1((int64_t)env->regs[reg]); + val =3D (target_long)env->regs[reg]; } else { - val =3D abs1((int32_t)env->regs[reg]); + val =3D (int32_t)env->regs[reg]; } - if (ctrl & 1) { - if (val > 8) { - return 8; - } + limit =3D 8; } else { - if (val > 16) { - return 16; - } + limit =3D 16; } - return val; + if ((val > limit) || (val < -limit)) { + return limit; + } + return abs1(val); } =20 static inline int pcmp_ilen(Reg *r, uint8_t ctrl) --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130975692311.58955214493324; Thu, 28 Apr 2022 00:29:35 -0700 (PDT) Received: from localhost ([::1]:38334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyak-00065b-Eb for importer@patchew.org; Thu, 28 Apr 2022 03:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51066) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy24-0000Bf-5D for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:44 -0400 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]:34518) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy22-00055V-Jx for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:43 -0400 Received: by mail-ed1-x531.google.com with SMTP id a21so4411090edb.1 for ; Wed, 27 Apr 2022 23:53:42 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ac2CzGb/67yyLXxUqxt9hRvc6wlmfyVIexf28Q5NYII=; b=qVlSCLmDj7iABnbZUgswPYhySNN9AsBo2Fkg91zIR2v8+ZpMbYJf8qUoTyFPmgWBC0 lCbTJ2QSAzLv5qnqeF/zTwnFsHbeTlF+Kbb7UVm0eZOMjkzJmzvtyV+POUN9s8Mh1v/V KMtQzlU/KbIJuzUcqaX9ItHLu6BE8tGVLoIKFk2j3yGDW2QUyd849V9KH+csKdx8w5UI orw54lIcvijIVtY5oJ8RtfXAIlvgANy+54t/yqse2ByL7d1C1f6dyb8Hna+ZCns7yaFx CQOMq4kWnAAbdc6TCAmaoy4KY6ykWD4IMHf0MvJaC6g2MgmofRNMqHqdGTepdSUHxqLN XC7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ac2CzGb/67yyLXxUqxt9hRvc6wlmfyVIexf28Q5NYII=; b=DiYfwqFm3fTTIzo5uHb+MTPEvHfnY4sPQNNoxCnIBFGp1KsBWC0J6n71lGhxL/X3f0 ircB+yK7TsO7yABAgbTubSNeOkK3YqfG5xxO1o5yt3wxGUVAFTzq7ipWfCUDXm0qqrrm T+elmgcwYnIHi67JZe8sJFGGxg6WApnPThRCHc2VnaXqVhwe1AHxXnJdTcPU8GVzwVG5 GWZfPBtFjnG1Z0jTkKQA5hqHJAG5TSN2ivLy/BaG+gnIvagIVRz1B35xURVL+1dNIdcy 5Nuajje531rjalzi4SqQDCGY21s4VXPs/JSmICTMC/76rcMtMwQf1rbP/i+GNLIQdn/1 sVyw== X-Gm-Message-State: AOAM530XlOrKKeLOvnJL5W/sIDKqpfH9B2lQcL5dBC8jqqIxC32GHqws c3kMWwScSwn29wjuZfrFzyMFLSlX31Hx0A== X-Google-Smtp-Source: ABdhPJyHbp8aYcngRohovEVI3VJMXsqeQWU9s3xBtQoYkvzEonCI0DpxXlTkigVROCpw+MkN6GpecA== X-Received: by 2002:a05:6402:2804:b0:420:caf1:961c with SMTP id h4-20020a056402280400b00420caf1961cmr34696564ede.280.1651128821042; Wed, 27 Apr 2022 23:53:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/18] meson: show final set of compiler flags Date: Thu, 28 Apr 2022 08:53:22 +0200 Message-Id: <20220428065335.189795-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130978112100001 The actual set of compiler flags can grow beyond what is found by the confi= gure script, for example if gprof is used. Show the full set in the summary. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 0c38e491f4..9beca38ebb 100644 --- a/meson.build +++ b/meson.build @@ -3535,10 +3535,10 @@ link_args =3D get_option(link_language + '_link_arg= s') if link_args.length() > 0 summary_info +=3D {'LDFLAGS': ' '.join(link_args)} endif -summary_info +=3D {'QEMU_CFLAGS': config_host['QEMU_CFLAGS']} -summary_info +=3D {'QEMU_CXXFLAGS': config_host['QEMU_CXXFLAGS']} -summary_info +=3D {'QEMU_OBJCFLAGS': config_host['QEMU_OBJCFLAGS']} -summary_info +=3D {'QEMU_LDFLAGS': config_host['QEMU_LDFLAGS']} +summary_info +=3D {'QEMU_CFLAGS': ' '.join(qemu_cflags)} +summary_info +=3D {'QEMU_CXXFLAGS': ' '.join(qemu_cxxflags)} +summary_info +=3D {'QEMU_OBJCFLAGS': ' '.join(qemu_objcflags)} +summary_info +=3D {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} summary_info +=3D {'profiler': get_option('profiler')} summary_info +=3D {'link-time optimization (LTO)': get_option('b_lto')} summary_info +=3D {'PIE': get_option('b_pie')} --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131288981897.0464587779622; Thu, 28 Apr 2022 00:34:48 -0700 (PDT) Received: from localhost ([::1]:46704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyfn-0003h7-Lh for importer@patchew.org; Thu, 28 Apr 2022 03:34:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy24-0000EJ-TL for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:44 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:35409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy23-00055Y-7A for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:44 -0400 Received: by mail-ed1-x530.google.com with SMTP id y21so4410596edo.2 for ; Wed, 27 Apr 2022 23:53:42 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eWVoNFg17cglqQICzMxJj6RBiNCEoEjYKsESWBBr/7w=; b=ierrJpoe3K0/aMvDWwp52ZWelIQkIaHWS/JozVYvVGIMvnWwxPrDmKPQlMw2NL4FrU LNDjVxn+Kc9Rk6MMYs7atkYa0tKfvJALSruHRsUASDrJb4TtGclJb85oEhsUWGTe/dGy zf/hFtZjy6I232kJoNvhRKxT8GrLXX+e24oyhUCdpu6hsPg4ngLJ4mCkvtteXLwFpjy/ Jom+CXofOdc2ncBucWBPmsOoIFhui7/Tk8bDNXT8WlQmx065taHN8Gw/UMwX/UwEY5Ef 7jgeGsngT3pSCs+Bg4UHKzoQe4vAvz2FPwKnmrelR9/TU1hACsAO/igVGN07OWquz8ie JvIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eWVoNFg17cglqQICzMxJj6RBiNCEoEjYKsESWBBr/7w=; b=ve1gzSZRPZOq3iZegR5JfSlKnIQWbWxK+0/c7bOpw7ON8wMu2QEFGM1DH/ya2thlDE hvXrG3uu+eOjjQ1ffUjoLajlO7yhLKohsmsslir5KdkuKcIfwVzIzsNqkLvwvRY2UV8o Vx5ozcaz9nSa+dc2JGWxafoiIBCOvy9guAOjnY5rMkBtVDrUyFMwL6fFQAyUlD/kVqQm cbLUYpRCE44dcOHMuCEBwZS8OclseK0f9tgMkJkLGP7j+HzQJqaRsQojNCRmaS+oa2od M5MNITsOR+0q619qW2wAUrC9sMUhqHjzeZAWI4OeUfji1AvPAPdz+EB/6uVkgTlHsa3d hYgg== X-Gm-Message-State: AOAM533UqfQXB2G/NUiEXQIDcgiYMY+/tPITc4VAth5jw3eqqHhGw/X/ h3RBzacGQ+/bC/igy3YJSH/b9mnD/6JXnw== X-Google-Smtp-Source: ABdhPJyi6BtMvHV1leuTMtqA/1dI5AlDjuE2vBRkL0LCYEPxfmWhRipYALlZ6K//yVwnsHcRaIJ/bA== X-Received: by 2002:a05:6402:f18:b0:425:df36:6e99 with SMTP id i24-20020a0564020f1800b00425df366e99mr23633191eda.303.1651128821661; Wed, 27 Apr 2022 23:53:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/18] configure: remove dead code Date: Thu, 28 Apr 2022 08:53:23 +0200 Message-Id: <20220428065335.189795-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131290560100001 tcg_interpreter is never written, it is purely a meson option; trace_backends is never read. And SeaBIOS is only build from the source tree with roms/Makefile, so the config.mak file is unused. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/configure b/configure index a4942c13e4..9e32c96fce 100755 --- a/configure +++ b/configure @@ -320,7 +320,6 @@ linux_user=3D"" bsd_user=3D"" pkgversion=3D"" pie=3D"" -trace_backends=3D"log" trace_file=3D"trace" opengl=3D"$default_feature" coroutine=3D"" @@ -391,7 +390,6 @@ for opt do cross_cc_vars=3D"$cross_cc_vars cross_cc_cflags_${cc= _arch}" ;; --cross-cc-*) cc_arch=3D${opt#--cross-cc-}; cc_arch=3D${cc_arch%%=3D*} - cc_archs=3D"$cc_archs $cc_arch" eval "cross_cc_${cc_arch}=3D\$optarg" cross_cc_vars=3D"$cross_cc_vars cross_cc_${cc_arch}" ;; @@ -2881,9 +2879,6 @@ fi if test "$vhost_user_fs" =3D "yes" ; then echo "CONFIG_VHOST_USER_FS=3Dy" >> $config_host_mak fi -if test "$tcg" =3D "enabled" -a "$tcg_interpreter" =3D "true" ; then - echo "CONFIG_TCG_INTERPRETER=3Dy" >> $config_host_mak -fi =20 if test "$opengl" =3D "yes" ; then echo "CONFIG_OPENGL=3Dy" >> $config_host_mak @@ -3024,7 +3019,6 @@ LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" -LINKS=3D"$LINKS roms/seabios/Makefile" LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit LINKS=3D"$LINKS tests/avocado tests/data" @@ -3059,24 +3053,6 @@ done export target_list source_path use_containers cpu host_cc $source_path/tests/tcg/configure.sh) =20 -# temporary config to build submodules -if test -f $source_path/roms/seabios/Makefile; then - for rom in seabios; do - config_mak=3Droms/$rom/config.mak - echo "# Automatically generated by configure - do not modify" > $confi= g_mak - echo "SRC_PATH=3D$source_path/roms/$rom" >> $config_mak - echo "AS=3D$as" >> $config_mak - echo "CCAS=3D$ccas" >> $config_mak - echo "CC=3D$cc" >> $config_mak - echo "BCC=3Dbcc" >> $config_mak - echo "CPP=3D$cpp" >> $config_mak - echo "OBJCOPY=3Dobjcopy" >> $config_mak - echo "IASL=3D$iasl" >> $config_mak - echo "LD=3D$ld" >> $config_mak - echo "RANLIB=3D$ranlib" >> $config_mak - done -fi - config_mak=3Dpc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak echo "TOPSRC_DIR=3D$source_path" >> $config_mak --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131595910412.913688155587; Thu, 28 Apr 2022 00:39:55 -0700 (PDT) Received: from localhost ([::1]:53818 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njykk-0001Fk-Ch for importer@patchew.org; Thu, 28 Apr 2022 03:39:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy25-0000Gn-Il for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:45 -0400 Received: from mail-ed1-x530.google.com ([2a00:1450:4864:20::530]:37869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy23-00055k-QX for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:45 -0400 Received: by mail-ed1-x530.google.com with SMTP id k27so4398424edk.4 for ; Wed, 27 Apr 2022 23:53:43 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=875vs54jSlHP1j/ag97c6ycrMEKN/NuuwrYXpt6BYgw=; b=ibgaYLeJDbS8WXeKPO6usa+B9CgYOqH012zljD7g7K9U51mLYkSYOMkizbXZB8Mn6F jwuOP5RmOAUouLOfKgUOmuH5sDi/ojnECje8CzxMxaVtml5VFcxKggjgFj1nsD3BNSIF 0K0CxIxKftbAomFsbx4uDIow0wpq6fNHxGEEEsJSD1G5oFt3jt7pXveXzPaRtcYi/a+K XpFKBCZJOFcL7vzeYgnwGazg6SnFMhYPbb1EJemACT55WCbnVZmmFkQ8ODBa23UC+dUz gb4AvPiHQWowJ5SxE3uZNbvzTnYL13Tubl7TjDXnauV0/UWDH/2t4v2ARk4VGm0HDp0D 76hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=875vs54jSlHP1j/ag97c6ycrMEKN/NuuwrYXpt6BYgw=; b=yycczkSTLSe9z380HAMZgMy/cKkwIBpXtZJX3uWBjoc+PdvR9F0uJ7wtE87GCIsvEJ Z93ai/4FZG/i+/80dRVxogUKWejGG6pn8FNduEu0OEmCohlFKwLFmOUqUGQubxiQZo4X 0B4FBtVS1mFXBR2kItenifN9CnReGCRew2QnA+TSmQsEV34WOcpD58Js3IjnGOfDOkbN 7pgJUNg0PnTro0UfkRt0tkXo2LdxFmf1LDFPyDMUrMJqdHR0ALPmVCjgHooSVI6sq49d LvdWT4zp1ntwFhyRJMSi6ALxLBYE2iB1Vzwnt2cOPkkt0CmRFF2AQFJx4r/O9Paa0MLV K/Ng== X-Gm-Message-State: AOAM531lUfs7P2848aEQVQkFQGayfWe6KA/qyFY97MD8PsQU0LYb2ggS 8SWrLhRvDEJSbKny9T0x5IWHrbbP79FY2A== X-Google-Smtp-Source: ABdhPJx9qnOXfWVxodfMEYHABXai4qoaEak0aBWL2+tqknadB0N1S1R/bulq7vD9cmChRMb8UkbUgg== X-Received: by 2002:a50:d4d0:0:b0:425:f894:7a73 with SMTP id e16-20020a50d4d0000000b00425f8947a73mr14230220edj.245.1651128822429; Wed, 27 Apr 2022 23:53:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/18] qga: wixl: get path to sysroot from pkg-config as intended Date: Thu, 28 Apr 2022 08:53:24 +0200 Message-Id: <20220428065335.189795-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131597531100001 The .wxs file uses $(var.Mingw_bin) while configure/meson have always used Mingw_dlls. Fix them to match what was probably intended. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 4 ++-- qga/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 9e32c96fce..049f669a94 100755 --- a/configure +++ b/configure @@ -2702,7 +2702,7 @@ if test "$QEMU_GA_VERSION" =3D ""; then QEMU_GA_VERSION=3D$(cat $source_path/VERSION) fi =20 -QEMU_GA_MSI_MINGW_DLL_PATH=3D"$($pkg_config --variable=3Dprefix glib-2.0)/= bin" +QEMU_GA_MSI_MINGW_BIN_PATH=3D"$($pkg_config --variable=3Dprefix glib-2.0)/= bin" =20 # Mac OS X ships with a broken assembler roms=3D @@ -2790,7 +2790,7 @@ if test "$debug_tcg" =3D "yes" ; then fi if test "$mingw32" =3D "yes" ; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak - echo "QEMU_GA_MSI_MINGW_DLL_PATH=3D${QEMU_GA_MSI_MINGW_DLL_PATH}" >> $co= nfig_host_mak + echo "QEMU_GA_MSI_MINGW_BIN_PATH=3D${QEMU_GA_MSI_MINGW_BIN_PATH}" >> $co= nfig_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER}" >> $config_host_mak echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO}" >> $config_host_mak echo "QEMU_GA_VERSION=3D${QEMU_GA_VERSION}" >> $config_host_mak diff --git a/qga/meson.build b/qga/meson.build index 392d560941..6d9f39bb32 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -129,7 +129,7 @@ if targetos =3D=3D 'windows' wixl, '-o', '@OUTPUT0@', '@INPUT0@', qemu_ga_msi_arch[cpu], qemu_ga_msi_vss, - '-D', 'Mingw_dlls=3D' + config_host['QEMU_GA= _MSI_MINGW_DLL_PATH'], + '-D', 'Mingw_bin=3D' + config_host['QEMU_GA_= MSI_MINGW_BIN_PATH'], ]) all_qga +=3D [qga_msi] alias_target('msi', qga_msi) --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130282740294.0557896974958; Thu, 28 Apr 2022 00:18:02 -0700 (PDT) Received: from localhost ([::1]:51514 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyPZ-0003YW-AU for importer@patchew.org; Thu, 28 Apr 2022 03:18:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51110) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy26-0000Ib-8h for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:46 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]:40486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy24-00055u-Lq for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:45 -0400 Received: by mail-ej1-x633.google.com with SMTP id l18so7593064ejc.7 for ; Wed, 27 Apr 2022 23:53:44 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SfhKCmUO//k2KKxCugtKMMJyeYbHUaz7sxHNSvDAQHc=; b=SSgHlNPZOFNUTnBeQOWfAXgf7doPyIwv9bAQ2jEdB1Vwytd/c6rEI+2oz4GsC7GpLi rti0klwf4TqMBkfD8mCrmKyKvH/9N5DpEEemXYDeV5YO2/yQaBkw/6Yc902GPmDjkhfG E33XEA0ZBtOieL7QFpmne0boZPhm0Q3eTh2uaE7t3e41h6zI2BdJdKZXGa3d2S2QHvEO EeqYxRko5Pm27AE783DPpEqBiib6pCwDmPGkzinWyWz1IqoH/xyM2EJHLUFd2n5zAvbb KYxP3hhs/Qvdpl4il2CAN09b4CKzmOCX0bhIfRL9owdBgnyzBVZSM7k/gjSe4H7WmQDT ZjxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SfhKCmUO//k2KKxCugtKMMJyeYbHUaz7sxHNSvDAQHc=; b=29gDuaTum5k4OJ2rpz93Zytw9QzyKfpHeMop63leOf6Dtn7TQzUMiq4y4nWdbvYQCa GGal6/WeT7Sw/QzxXDyJvVzkv1yNOWg4XCy9vtlGO/06BCFUp0GpdlrYp5cxGoWyD0Lk PGz2mq8cilQbYPODoSmH5MwAA2Pv18GIAtZ4bc4jGcdS5f2jFyv7gGvE202f+YxUxcki +RlrTac8pFTxkxlX72qZ4OX8tHjJPBtxachfZaxNPIK+778dicePMZWAQ6/1RAijuv4Q vta31hc+K4kxmviUTTgBHGK2gaMQdX9q2CyBphiEK1CuxBQhjp//YpwS6v3RCH4QfERR ZQMg== X-Gm-Message-State: AOAM532Z7xJsGQoroUE6agYmXUW1l6axCwaIPrh8vGeV+CQ+8lAnosxe 8WpVxX7GaQyR58wYSZnPn+UvPulT/fgjqw== X-Google-Smtp-Source: ABdhPJwvitATW50FQHPasvb+SSTnLqAg2gmqs5WpRpWzPbdeCEgjOQvOBEQA5EPeUdfcGjAiIbKacQ== X-Received: by 2002:a17:906:699:b0:6f3:a7a3:d3 with SMTP id u25-20020a170906069900b006f3a7a300d3mr14563881ejb.650.1651128823341; Wed, 27 Apr 2022 23:53:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/18] configure: pc-bios/qemu-icon.bmp does not exist Date: Thu, 28 Apr 2022 08:53:25 +0200 Message-Id: <20220428065335.189795-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::633; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130284000100001 The file has been removed in commit a8260d3876 ("ui: install logo icons to $prefix/share/icons", 2019-01-21), do not try to symlink it in the build tr= ee. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 1 - 1 file changed, 1 deletion(-) diff --git a/configure b/configure index 049f669a94..a6ed3498f2 100755 --- a/configure +++ b/configure @@ -3019,7 +3019,6 @@ LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" LINKS=3D"$LINKS pc-bios/s390-ccw/Makefile" -LINKS=3D"$LINKS pc-bios/qemu-icon.bmp" LINKS=3D"$LINKS .gdbinit scripts" # scripts needed by relative path in .gd= binit LINKS=3D"$LINKS tests/avocado tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651130681117279.5477048507962; Thu, 28 Apr 2022 00:24:41 -0700 (PDT) Received: from localhost ([::1]:60140 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyVz-0001AN-Pe for importer@patchew.org; Thu, 28 Apr 2022 03:24:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy26-0000Iy-MX for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:46 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:43897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy25-000564-Bz for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:46 -0400 Received: by mail-ej1-x635.google.com with SMTP id m20so7574821ejj.10 for ; Wed, 27 Apr 2022 23:53:44 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=d57+wLsg6C86Ce9YcdDwqygNOrnIY2eU+VWx4qkmQXk=; b=ldJsYzryGyyGsyexENi3KudRtNkw21PU3hVSuayc6ORAoXpYHaYytAC19oopFLn9Y2 9Huz2D1autuTesz0pwwZh8BK61nZLFANPZZLf8Ja+hTuZLnU9iUAOacAn0H6LYm+eBFh MbFHJ64eSE4dkyQ2UXuMaMspB2QzI2pjjhWq0OluZdRNrCLQ8fw8oM01cpkjibHAcsZ+ Ccn/OLSK4Nyc8nbM5X4eGOKABq3sfa4qmafH3v96yRZKqG4txHkCN87R9pKUptXYq4Zr 9jTcMK0P6ZQly7RuGVAUy5NrCpIRwt+BVdv/aQnPaTrdsvydNnbAsY1eJFcxhTpSm2EY UR2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=d57+wLsg6C86Ce9YcdDwqygNOrnIY2eU+VWx4qkmQXk=; b=scHvmcqGPri3IUOOUmjONc8IAtSl6qZzva0rhBHQVhWcdzZgkEI5BPcmWrT/YtT/NQ oqnLhSVWMkUlCv+7TDEhdpu0Oxi1cus0qFViNBVAgFSQYOckQnt8M83E6B9SUHjqqKE1 ItU3z6Ig4Fw8NgoNyp1HonToaPCTKYyLkfzF589spNBljhTK2b5GDmtaU1XGaNQ9joir Tq0DtvaaQOb66shjVCgE0DI5O7umINRbYmSO/h7KKzqZbWKP/cV/Qnl3s23XXsljgzyF C0iCx9WWu3KyEAMQNt65V4OdG9rYxojNwEs18LQDLdr6sfXHn7NZfwF6LuwCXH+Gt/yI Nwfg== X-Gm-Message-State: AOAM533myGUACHVuL+OElrHUXDyBw5D/mypDouKzpHJbhs6Ck3vsP2op kNk1fwYiXesg6dJfKp8kRFvZWKeKNmysdw== X-Google-Smtp-Source: ABdhPJy5O2e9TxwSs2ww0aA/Cu07GXH8n02cr+UVkV+kIaIyUEn0/aQE3fzae9Haa/H6CoaqMsKkow== X-Received: by 2002:a17:906:e9b:b0:6f3:cfcc:922e with SMTP id p27-20020a1709060e9b00b006f3cfcc922emr5340079ejf.346.1651128823996; Wed, 27 Apr 2022 23:53:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/18] configure: gcov should not exclude fortify-source Date: Thu, 28 Apr 2022 08:53:26 +0200 Message-Id: <20220428065335.189795-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::635; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651130681969100001 There is no reason other than history (dating back to commit 1d728c3946, "t= ests: add gcov support", 2013-01-06) for this, remove this unnecessary conditional. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/configure b/configure index a6ed3498f2..e404b55da5 100755 --- a/configure +++ b/configure @@ -2625,9 +2625,7 @@ fi =20 write_c_skeleton =20 -if test "$gcov" =3D "yes" ; then - : -elif test "$fortify_source" =3D "yes" ; then +if test "$fortify_source" =3D "yes" ; then QEMU_CFLAGS=3D"-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3D2 $QEMU_CFLAGS" debug=3Dno fi --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131036539220.11534606455996; Thu, 28 Apr 2022 00:30:36 -0700 (PDT) Received: from localhost ([::1]:40534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njybi-0007aj-N5 for importer@patchew.org; Thu, 28 Apr 2022 03:30:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51126) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy27-0000Lw-KC for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:47 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:36611) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy26-00056E-2K for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:47 -0400 Received: by mail-ej1-x635.google.com with SMTP id k23so7629208ejd.3 for ; Wed, 27 Apr 2022 23:53:45 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iTOi8M+CKz+tteXqdlc9EtxfuKMXhzk+dpI+u7NWDEY=; b=l+jzYZUn73LLbir+yXOcJlHYms4THvVKWihGSvDKkbvzmDWLceoSnGhqoYcmnkCBz2 WRdUInsnDnJHiO2vfI0jI/c6NaNhWIKUFmFObyrV7yBg5bBxmgmxsNn9d4WnWb8FtYuk ZmtqFmsX5moEGjzB26HGNUvx8kCRKn/JAzmIHGsNB38DDKN3txndZte9qKp4hfI10rXF IMksm9UbKDZEoHwZYXdlNtiL4viUOlyh4SVRikHoXL0gwaeXw9nlwpT7toKR8qTnVKGi SKhNJx9ZKt8o79Ka5+9ocgWYqxVoLH2FlOeOfdLWWl01sQ/CBH1NNlJieGKGPlRVDE1T rYqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=iTOi8M+CKz+tteXqdlc9EtxfuKMXhzk+dpI+u7NWDEY=; b=zQNk43DYp2LH/AK6csUvnBSsO6+ZqFFzOarbxmXQL4JpeUPqFuePzL+jdAQTiGbm8w eMChowQSseKbCnxjsolpKWFouYoUViiZZJsHHtHx8mY7cFXn/0cOKdMx4QkqrasHuKgi TcUmN5BKFkj+2fC+PZWM2f9ZZUgxx0OlxWWYiFzRZpOnqh5qS4upSJJgIrb02l22NftZ xHdTya/Um5h68rSgwTpn2xf9xKPCJDjtAsYNNq/1QzqSRUME0NTlyogBYM58JyfCmPEW FvCe05UfrYwNB/FaXPVvsVjzyApEJMlL1E37+NAq+7iDDS1z6Teqk3uqYt4GZ4nep5XG NNMA== X-Gm-Message-State: AOAM531p5W0B6qh20aB/JnHYHtSrY7a3pIzQRPMv/94ghqgj2h0hDftf xbIf2dmv4nRTuFq+pL/ERZcm0/iSVTXM/g== X-Google-Smtp-Source: ABdhPJxxUtMJvhdl58vrL6Tcassxu9COiBoDqsy6DtBIGwrDE22uHkvnH0JcXjNZrDqtNzT7GQYnoQ== X-Received: by 2002:a17:907:d15:b0:6f3:bd8c:b436 with SMTP id gn21-20020a1709070d1500b006f3bd8cb436mr9640158ejc.618.1651128824776; Wed, 27 Apr 2022 23:53:44 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/18] configure: move --enable/--disable-debug-info to second option parsing pass Date: Thu, 28 Apr 2022 08:53:27 +0200 Message-Id: <20220428065335.189795-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::635; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131038138100001 $debug_info is not needed anywhere except in the final meson invocation, no need to special case it. Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e404b55da5..d704029284 100755 --- a/configure +++ b/configure @@ -244,7 +244,6 @@ audio_drv_list=3D"default" block_drv_rw_whitelist=3D"" block_drv_ro_whitelist=3D"" host_cc=3D"cc" -debug_info=3D"yes" lto=3D"false" stack_protector=3D"" safe_stack=3D"" @@ -304,6 +303,7 @@ vhost_user_fs=3D"$default_feature" vhost_vdpa=3D"$default_feature" rdma=3D"$default_feature" pvrdma=3D"$default_feature" +debug_info=3D"yes" debug_tcg=3D"no" debug=3D"no" sanitizers=3D"no" @@ -379,10 +379,6 @@ for opt do ;; --extra-ldflags=3D*) EXTRA_LDFLAGS=3D"$EXTRA_LDFLAGS $optarg" ;; - --enable-debug-info) debug_info=3D"yes" - ;; - --disable-debug-info) debug_info=3D"no" - ;; --cross-cc-*[!a-zA-Z0-9_-]*=3D*) error_exit "Passed bad --cross-cc-FOO o= ption" ;; --cross-cc-cflags-*) cc_arch=3D${opt#--cross-cc-cflags-}; cc_arch=3D${cc= _arch%%=3D*} @@ -759,12 +755,12 @@ for opt do ;; --extra-ldflags=3D*) ;; - --enable-debug-info) - ;; - --disable-debug-info) - ;; --cross-cc-*) ;; + --enable-debug-info) debug_info=3D"yes" + ;; + --disable-debug-info) debug_info=3D"no" + ;; --enable-modules) modules=3D"yes" ;; --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131029388262.1226434220024; Thu, 28 Apr 2022 00:30:29 -0700 (PDT) Received: from localhost ([::1]:40296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njybc-0007R0-A9 for importer@patchew.org; Thu, 28 Apr 2022 03:30:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51144) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy29-0000Px-0P for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:50 -0400 Received: from mail-ej1-x630.google.com ([2a00:1450:4864:20::630]:39870) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy26-00056P-Vd for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:48 -0400 Received: by mail-ej1-x630.google.com with SMTP id bv19so7613412ejb.6 for ; Wed, 27 Apr 2022 23:53:46 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TeT39VMliTZNbtF1FqxWT5EpnJe1Ps12IRTnmykQBlI=; b=qk8mMQzU7zP7U4IGe92F80cYEb3GXFrBLQt2PBAJwFBzJruag5n9sdyMzo20+Rg7zH GCdbAw1DRMNmuyEi5Jq//ep0rB6BTv9hJ8HpXdffSLuJ9C81wb+p2er9q7BE96Muf8bs rKAtblmXlx2L3JT9Uhyfjw79wtTOMpQ0axdt9ggjGhS6KZBDeojBJXyTZjSHrg1Cn6Mh s2OfGkS/23YHaEyBZsdgZSMy7pqgUXFMGrADww4V9D9klCHeZ/gWu7ibkClhvBt3oozv puaeckRpl4WmGwhAkac0RopqxNf8ifU7ZWAGkclQqrsxU+ZqTpfIUDoCdIzLb47MOz6A PHNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=TeT39VMliTZNbtF1FqxWT5EpnJe1Ps12IRTnmykQBlI=; b=8IKgEt/APe0tsT9xR8z7IyXnh1Jbd3L/K3NZPZ5qs/YTXY/jvdnkZ/Xc0Kh+K2287q TYqdVDmcgMxkzqv4Y3+0UFqZqHE4LGcaeTGMRdZt6/ZMaYEUX1rYHb1b6YLXqOPGjJoK DZueT0RX8TchK0AToCdkyxGGWiMznAVCjovz1Sm+s97/Z//8AaOBUPcg48o8BYoyjtiP CPEJ0UwFdJBIA0xi8hUxHS1mJuZxiweqoumruPBYwfOJwEV25k4PzUwU9Y0nIka/Nr5d gdMHWJmz6OPyHvBxSye8tbB4KrBuGay85PaCtMiyzgFYe0yFCSzTAryY+gFzO/NZXYZm wIag== X-Gm-Message-State: AOAM530uOQSOxAyroEaepEogdboAcnQMlRRX/pIeitKBKPRqTXl4K4vo GeO/XCpiO3tyw6yRek3apNmG5z4N1Cc6BA== X-Google-Smtp-Source: ABdhPJyS/G32iPPcajXwv0Z+3ANfH4aTbsTBrcqvAfMStY/FPZDT/GuXF+oQqaEvreg0P3IzjJkgIg== X-Received: by 2002:a17:907:a413:b0:6f3:a9e5:d076 with SMTP id sg19-20020a170907a41300b006f3a9e5d076mr13295961ejc.183.1651128825551; Wed, 27 Apr 2022 23:53:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/18] configure, meson: move OpenGL check to meson Date: Thu, 28 Apr 2022 08:53:28 +0200 Message-Id: <20220428065335.189795-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::630; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x630.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131030137100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 40 ----------------------------------- meson.build | 16 +++++++++----- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ ui/meson.build | 17 ++++++++------- 5 files changed, 25 insertions(+), 53 deletions(-) diff --git a/configure b/configure index d704029284..1aefbc2f68 100755 --- a/configure +++ b/configure @@ -321,7 +321,6 @@ bsd_user=3D"" pkgversion=3D"" pie=3D"" trace_file=3D"trace" -opengl=3D"$default_feature" coroutine=3D"" tls_priority=3D"NORMAL" plugins=3D"$default_feature" @@ -960,10 +959,6 @@ for opt do ;; --enable-vhost-user-fs) vhost_user_fs=3D"yes" ;; - --disable-opengl) opengl=3D"no" - ;; - --enable-opengl) opengl=3D"yes" - ;; --disable-zlib-test) ;; --disable-virtio-blk-data-plane|--enable-virtio-blk-data-plane) @@ -1258,7 +1253,6 @@ cat << EOF vhost-kernel vhost kernel backend support vhost-user vhost-user backend support vhost-vdpa vhost-vdpa kernel backend support - opengl opengl support gio libgio support =20 NOTE: The object files are built at the place where configure is launched @@ -2278,34 +2272,6 @@ case "$fdt" in esac =20 ########################################## -# opengl probe (for sdl2, gtk) - -if test "$opengl" !=3D "no" ; then - epoxy=3Dno - if $pkg_config epoxy; then - cat > $TMPC << EOF -#include -int main(void) { return 0; } -EOF - if compile_prog "" "" ; then - epoxy=3Dyes - fi - fi - - if test "$epoxy" =3D "yes" ; then - opengl_cflags=3D"$($pkg_config --cflags epoxy)" - opengl_libs=3D"$($pkg_config --libs epoxy)" - opengl=3Dyes - else - if test "$opengl" =3D "yes" ; then - feature_not_found "opengl" "Please install epoxy with EGL" - fi - opengl_cflags=3D"" - opengl_libs=3D"" - opengl=3Dno - fi -fi - # check for usbfs have_usbfs=3Dno if test "$linux_user" =3D "yes"; then @@ -2874,12 +2840,6 @@ if test "$vhost_user_fs" =3D "yes" ; then echo "CONFIG_VHOST_USER_FS=3Dy" >> $config_host_mak fi =20 -if test "$opengl" =3D "yes" ; then - echo "CONFIG_OPENGL=3Dy" >> $config_host_mak - echo "OPENGL_CFLAGS=3D$opengl_cflags" >> $config_host_mak - echo "OPENGL_LIBS=3D$opengl_libs" >> $config_host_mak -fi - # XXX: suppress that if [ "$bsd" =3D "yes" ] ; then echo "CONFIG_BSD=3Dy" >> $config_host_mak diff --git a/meson.build b/meson.build index 9beca38ebb..83b7347c5f 100644 --- a/meson.build +++ b/meson.build @@ -1000,9 +1000,14 @@ if not get_option('coreaudio').auto() or (targetos = =3D=3D 'darwin' and have_system) endif =20 opengl =3D not_found -if 'CONFIG_OPENGL' in config_host - opengl =3D declare_dependency(compile_args: config_host['OPENGL_CFLAGS']= .split(), - link_args: config_host['OPENGL_LIBS'].split(= )) +if not get_option('opengl').auto() or have_system or have_vhost_user_gpu + epoxy =3D dependency('epoxy', method: 'pkg-config', + required: get_option('opengl'), kwargs: static_kwarg= s) + if cc.has_header('epoxy/egl.h', dependencies: epoxy) + opengl =3D epoxy + elif get_option('opengl').enabled() + error('epoxy/egl.h not found') + endif endif gbm =3D not_found if (have_system or have_tools) and (virgl.found() or opengl.found()) @@ -1546,6 +1551,7 @@ config_host_data.set('CONFIG_LINUX_AIO', libaio.found= ()) config_host_data.set('CONFIG_LINUX_IO_URING', linux_io_uring.found()) config_host_data.set('CONFIG_LIBPMEM', libpmem.found()) config_host_data.set('CONFIG_NUMA', numa.found()) +config_host_data.set('CONFIG_OPENGL', opengl.found()) config_host_data.set('CONFIG_PROFILER', get_option('profiler')) config_host_data.set('CONFIG_RBD', rbd.found()) config_host_data.set('CONFIG_SDL', sdl.found()) @@ -2093,7 +2099,7 @@ host_kconfig =3D \ (have_tpm ? ['CONFIG_TPM=3Dy'] : []) + \ (spice.found() ? ['CONFIG_SPICE=3Dy'] : []) + \ (have_ivshmem ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ - ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=3Dy'] : []) + \ + (opengl.found() ? ['CONFIG_OPENGL=3Dy'] : []) + \ (x11.found() ? ['CONFIG_X11=3Dy'] : []) + \ ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=3Dy'] : []) + \ ('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=3Dy'] : []) + \ @@ -3708,7 +3714,7 @@ summary_info +=3D {'smartcard support': cacard} summary_info +=3D {'U2F support': u2f} summary_info +=3D {'libusb': libusb} summary_info +=3D {'usb net redir': usbredir} -summary_info +=3D {'OpenGL support': config_host.has_key('CONFIG_OPENGL= ')} +summary_info +=3D {'OpenGL support (epoxy)': opengl} summary_info +=3D {'GBM': gbm} summary_info +=3D {'libiscsi support': libiscsi} summary_info +=3D {'libnfs support': libnfs} diff --git a/meson_options.txt b/meson_options.txt index d85734f8e6..dbcf9722bb 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -149,6 +149,8 @@ option('lzo', type : 'feature', value : 'auto', description: 'lzo compression support') option('rbd', type : 'feature', value : 'auto', description: 'Ceph block device driver') +option('opengl', type : 'feature', value : 'auto', + description: 'OpenGL support') option('gtk', type : 'feature', value : 'auto', description: 'GTK+ user interface') option('sdl', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ef0dcd4a77..203f33ae18 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -91,6 +91,7 @@ meson_options_help() { printf "%s\n" ' nettle nettle cryptography support' printf "%s\n" ' numa libnuma support' printf "%s\n" ' nvmm NVMM acceleration support' + printf "%s\n" ' opengl OpenGL support' printf "%s\n" ' oss OSS sound support' printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' parallels parallels image format support' @@ -271,6 +272,8 @@ _meson_option_parse() { --disable-numa) printf "%s" -Dnuma=3Ddisabled ;; --enable-nvmm) printf "%s" -Dnvmm=3Denabled ;; --disable-nvmm) printf "%s" -Dnvmm=3Ddisabled ;; + --enable-opengl) printf "%s" -Dopengl=3Denabled ;; + --disable-opengl) printf "%s" -Dopengl=3Ddisabled ;; --enable-oss) printf "%s" -Doss=3Denabled ;; --disable-oss) printf "%s" -Doss=3Ddisabled ;; --enable-pa) printf "%s" -Dpa=3Denabled ;; diff --git a/ui/meson.build b/ui/meson.build index 64286ba150..b21d3d1534 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,5 +1,6 @@ softmmu_ss.add(pixman) specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: pixman) # for the inc= lude path +specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl) # for the inc= lude path =20 softmmu_ss.add(files( 'clipboard.c', @@ -43,7 +44,6 @@ vnc_ss.add(zlib, png, jpeg, gnutls) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) softmmu_ss.add_all(when: vnc, if_true: vnc_ss) softmmu_ss.add(when: vnc, if_false: files('vnc-stubs.c')) -specific_ss.add(when: ['CONFIG_SOFTMMU'], if_true: opengl) =20 ui_modules =3D {} =20 @@ -53,17 +53,18 @@ if curses.found() ui_modules +=3D {'curses' : curses_ss} endif =20 -if config_host.has_key('CONFIG_OPENGL') +softmmu_ss.add(opengl) +if opengl.found() opengl_ss =3D ss.source_set() opengl_ss.add(gbm) - opengl_ss.add(when: [opengl, pixman, 'CONFIG_OPENGL'], + opengl_ss.add(when: [opengl, pixman], if_true: files('shader.c', 'console-gl.c', 'egl-helpers.c',= 'egl-context.c')) ui_modules +=3D {'opengl' : opengl_ss} endif =20 -if config_host.has_key('CONFIG_OPENGL') and gbm.found() +if opengl.found() and gbm.found() egl_headless_ss =3D ss.source_set() - egl_headless_ss.add(when: [opengl, gbm, pixman, 'CONFIG_OPENGL'], + egl_headless_ss.add(when: [opengl, gbm, pixman], if_true: files('egl-headless.c')) ui_modules +=3D {'egl-headless' : egl_headless_ss} endif @@ -98,8 +99,8 @@ if gtk.found() gtk_ss =3D ss.source_set() gtk_ss.add(gtk, vte, pixman, files('gtk.c', 'gtk-clipboard.c')) gtk_ss.add(when: x11, if_true: files('x_keymap.c')) - gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-gl-area.= c')) - gtk_ss.add(when: [x11, opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl= .c')) + gtk_ss.add(when: opengl, if_true: files('gtk-gl-area.c')) + gtk_ss.add(when: [x11, opengl], if_true: files('gtk-egl.c')) ui_modules +=3D {'gtk' : gtk_ss} endif =20 @@ -112,7 +113,7 @@ if sdl.found() 'sdl2-input.c', 'sdl2.c', )) - sdl_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('sdl2-gl.c')) + sdl_ss.add(when: opengl, if_true: files('sdl2-gl.c')) sdl_ss.add(when: x11, if_true: files('x_keymap.c')) ui_modules +=3D {'sdl' : sdl_ss} endif --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131367348131.12720274406513; Thu, 28 Apr 2022 00:36:07 -0700 (PDT) Received: from localhost ([::1]:48664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyh3-0005Tk-Is for importer@patchew.org; Thu, 28 Apr 2022 03:36:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2A-0000QA-1T for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:50 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:43895) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy28-00056f-05 for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:49 -0400 Received: by mail-ej1-x632.google.com with SMTP id m20so7574994ejj.10 for ; Wed, 27 Apr 2022 23:53:47 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=SdVDlq9h49jPx35cP21eV6RQsn8nPu5Pm6Lev407IOc=; b=MwbzbhyvWg5z8JylFj3faSmd/JHtdcPYlTLbHVb+86a24RZF2lZzwNee0mSkeu0n0V bvDPEdgoOnIB5X8ITXTvizReBXIxUwwTGNN0SWEwcZ8Iczo/CALEOCM0lXIPv8JqV9jI a26YmJhhBNEMukrpAz6AgOx1Sb4jXJbmnbJ6JYRzSkx0V6FquQMDK9/I394D6B2qxEw8 U0O14ErfRZhM5dl+ntSE3CfE0l2tICBerJJ/0IAHWb34ZmDSdBhPqIOQ5L35D9ZSNYv9 CtOg9qfe4xHoa834p8qHjqPcwK0b4ciCFMrJ+NjdgJLYdOfb8Qsa5Ye5xvbVJIDS+wDH VCOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=SdVDlq9h49jPx35cP21eV6RQsn8nPu5Pm6Lev407IOc=; b=0u/YYV3Jn2/I1PQySELGzv2e5Onxg6Rn+PasodQm/UiHRsZOX0FnadvjgTBYr6XYae pkw3TOs7xDe6dcFWLnX/RqWCRQubdjdfwP2znoqeZYtk85Xb+bw6CwMZUgCPo4LPr3bx J26F+wphdJLLi3dm2jkM9tHPzJtbbD9HNr+A4juS4hsYqNBZLNjf5eXxAR0BN4x3QU8E 8U/9M9qw1G0vXlu64g/jW4hVB5rUp9XT4hxVahFqshgi2S0zQTFcHC/zMAyVvey1WgJy 95ZNRQM9sjuovnS3ndsMqjBQvIPEwFCE3gBt5lhHcgnWhRIItVCFdrUJnmTUqmfSNJE/ gH2A== X-Gm-Message-State: AOAM532NpCCyQXdT5TeLJCspkvdlf/n+OHDh6FgcV6QASYwPYgiVKrTv jTr7Bdl8gFTp8KRUp/ui6kZcFw5uxsac1Q== X-Google-Smtp-Source: ABdhPJz5OiqzusIhN9mOFPKq6EScduwvDNLFGhr5XgiR9q0QKoRQBN7iFF5wqXb5n8OOvKwd5zW5xg== X-Received: by 2002:a17:906:9746:b0:6e0:5c9a:1a20 with SMTP id o6-20020a170906974600b006e05c9a1a20mr30894294ejy.714.1651128826428; Wed, 27 Apr 2022 23:53:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/18] meson, configure: move RDMA options to meson Date: Thu, 28 Apr 2022 08:53:29 +0200 Message-Id: <20220428065335.189795-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::632; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131368868100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 115 --------------------------------- contrib/rdmacm-mux/meson.build | 4 +- meson.build | 56 ++++++++++++++-- meson_options.txt | 4 ++ migration/meson.build | 2 +- scripts/meson-buildoptions.sh | 6 ++ 6 files changed, 62 insertions(+), 125 deletions(-) diff --git a/configure b/configure index 1aefbc2f68..4deca94235 100755 --- a/configure +++ b/configure @@ -301,8 +301,6 @@ vhost_vsock=3D"$default_feature" vhost_user=3D"no" vhost_user_fs=3D"$default_feature" vhost_vdpa=3D"$default_feature" -rdma=3D"$default_feature" -pvrdma=3D"$default_feature" debug_info=3D"yes" debug_tcg=3D"no" debug=3D"no" @@ -972,14 +970,6 @@ for opt do ;; --tls-priority=3D*) tls_priority=3D"$optarg" ;; - --enable-rdma) rdma=3D"yes" - ;; - --disable-rdma) rdma=3D"no" - ;; - --enable-pvrdma) pvrdma=3D"yes" - ;; - --disable-pvrdma) pvrdma=3D"no" - ;; --disable-vhost-user) vhost_user=3D"no" ;; --enable-vhost-user) vhost_user=3D"yes" @@ -1244,8 +1234,6 @@ cat << EOF lto Enable Link-Time Optimization. safe-stack SafeStack Stack Smash Protection. Depends on clang/llvm >=3D 3.7 and requires coroutine backend ucont= ext. - rdma Enable RDMA-based migration - pvrdma Enable PVRDMA support vhost-net vhost-net kernel acceleration support vhost-vsock virtio sockets device support vhost-scsi vhost-scsi kernel target support @@ -2037,100 +2025,6 @@ EOF fi fi =20 -########################################## -# RDMA needs OpenFabrics libraries -if test "$rdma" !=3D "no" ; then - cat > $TMPC < -int main(void) { return 0; } -EOF - rdma_libs=3D"-lrdmacm -libverbs -libumad" - if compile_prog "" "$rdma_libs" ; then - rdma=3D"yes" - else - if test "$rdma" =3D "yes" ; then - error_exit \ - " OpenFabrics librdmacm/libibverbs/libibumad not present." \ - " Your options:" \ - " (1) Fast: Install infiniband packages (devel) from your dis= tro." \ - " (2) Cleanest: Install libraries from www.openfabrics.org" \ - " (3) Also: Install softiwarp if you don't have RDMA hardware" - fi - rdma=3D"no" - fi -fi - -########################################## -# PVRDMA detection - -cat > $TMPC < - -int -main(void) -{ - char buf =3D 0; - void *addr =3D &buf; - addr =3D mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); - - return 0; -} -EOF - -if test "$rdma" =3D "yes" ; then - case "$pvrdma" in - "") - if compile_prog "" ""; then - pvrdma=3D"yes" - else - pvrdma=3D"no" - fi - ;; - "yes") - if ! compile_prog "" ""; then - error_exit "PVRDMA is not supported since mremap is not implem= ented" - fi - pvrdma=3D"yes" - ;; - "no") - pvrdma=3D"no" - ;; - esac -else - if test "$pvrdma" =3D "yes" ; then - error_exit "PVRDMA requires rdma suppport" - fi - pvrdma=3D"no" -fi - -# Let's see if enhanced reg_mr is supported -if test "$pvrdma" =3D "yes" ; then - -cat > $TMPC < - -int -main(void) -{ - struct ibv_mr *mr; - struct ibv_pd *pd =3D NULL; - size_t length =3D 10; - uint64_t iova =3D 0; - int access =3D 0; - void *addr =3D NULL; - - mr =3D ibv_reg_mr_iova(pd, addr, length, iova, access); - - ibv_dereg_mr(mr); - - return 0; -} -EOF - if ! compile_prog "" "-libverbs"; then - QEMU_CFLAGS=3D"$QEMU_CFLAGS -DLEGACY_RDMA_REG_MR" - fi -fi - ########################################## # glib support probe =20 @@ -2855,15 +2749,6 @@ if test "$have_tsan" =3D "yes" && test "$have_tsan_i= face_fiber" =3D "yes" ; then echo "CONFIG_TSAN=3Dy" >> $config_host_mak fi =20 -if test "$rdma" =3D "yes" ; then - echo "CONFIG_RDMA=3Dy" >> $config_host_mak - echo "RDMA_LIBS=3D$rdma_libs" >> $config_host_mak -fi - -if test "$pvrdma" =3D "yes" ; then - echo "CONFIG_PVRDMA=3Dy" >> $config_host_mak -fi - if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak fi diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build index 7674f54cc5..36c9c89630 100644 --- a/contrib/rdmacm-mux/meson.build +++ b/contrib/rdmacm-mux/meson.build @@ -1,7 +1,5 @@ -if 'CONFIG_PVRDMA' in config_host - # if not found, CONFIG_PVRDMA should not be set +if have_pvrdma # FIXME: broken on big endian architectures - libumad =3D cc.find_library('ibumad', required: true) executable('rdmacm-mux', files('main.c'), genh, dependencies: [glib, libumad], build_by_default: false, diff --git a/meson.build b/meson.build index 83b7347c5f..9c03436756 100644 --- a/meson.build +++ b/meson.build @@ -1219,9 +1219,22 @@ if numa.found() and not cc.links(''' endif =20 rdma =3D not_found -if 'CONFIG_RDMA' in config_host - rdma =3D declare_dependency(link_args: config_host['RDMA_LIBS'].split()) +if not get_option('rdma').auto() or have_system + libumad =3D cc.find_library('ibumad', required: get_option('rdma')) + rdma_libs =3D [cc.find_library('rdmacm', has_headers: ['rdma/rdma_cma.h'= ], + required: get_option('rdma'), + kwargs: static_kwargs), + cc.find_library('ibverbs', required: get_option('rdma'), + kwargs: static_kwargs), + libumad] + rdma =3D declare_dependency(dependencies: rdma_libs) + foreach lib: rdma_libs + if not lib.found() + rdma =3D not_found + endif + endforeach endif + xen =3D not_found if 'CONFIG_XEN_BACKEND' in config_host xen =3D declare_dependency(compile_args: config_host['XEN_CFLAGS'].split= (), @@ -1554,6 +1567,7 @@ config_host_data.set('CONFIG_NUMA', numa.found()) config_host_data.set('CONFIG_OPENGL', opengl.found()) config_host_data.set('CONFIG_PROFILER', get_option('profiler')) config_host_data.set('CONFIG_RBD', rbd.found()) +config_host_data.set('CONFIG_RDMA', rdma.found()) config_host_data.set('CONFIG_SDL', sdl.found()) config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) config_host_data.set('CONFIG_SECCOMP', seccomp.found()) @@ -1652,7 +1666,7 @@ config_host_data.set('HAVE_SYSTEM_FUNCTION', cc.has_f= unction('system', prefix: ' if rdma.found() config_host_data.set('HAVE_IBV_ADVISE_MR', cc.has_function('ibv_advise_mr', - args: config_host['RDMA_LIBS'].spli= t(), + dependencies: rdma, prefix: '#include ')) endif =20 @@ -1972,6 +1986,36 @@ config_host_data.set('CONFIG_AVX512F_OPT', get_optio= n('avx512f') \ int main(int argc, char *argv[]) { return bar(argv[0]); } '''), error_message: 'AVX512F not available').allowed()) =20 +have_pvrdma =3D get_option('pvrdma') \ + .require(rdma.found(), error_message: 'PVRDMA requires OpenFabrics libra= ries') \ + .require(cc.compiles(''' + int main(void) + { + char buf =3D 0; + void *addr =3D &buf; + addr =3D mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); + + return 0; + }'''), error_message: 'PVRDMA requires mremap').allowed() + +if have_pvrdma + config_host_data.set('LEGACY_RDMA_REG_MR', not cc.compiles(''' + #include + int main(void) + { + struct ibv_mr *mr; + struct ibv_pd *pd =3D NULL; + size_t length =3D 10; + uint64_t iova =3D 0; + int access =3D 0; + void *addr =3D NULL; + + mr =3D ibv_reg_mr_iova(pd, addr, length, iova, access); + ibv_dereg_mr(mr); + return 0; + }''')) +endif + if get_option('membarrier').disabled() have_membarrier =3D false elif targetos =3D=3D 'windows' @@ -2106,7 +2150,7 @@ host_kconfig =3D \ ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=3Dy'] : []= ) + \ (have_virtfs ? ['CONFIG_VIRTFS=3Dy'] : []) + \ ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=3Dy'] : []) + \ - ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=3Dy'] : []) + \ + (have_pvrdma ? ['CONFIG_PVRDMA=3Dy'] : []) + \ (multiprocess_allowed ? ['CONFIG_MULTIPROCESS_ALLOWED=3Dy'] : []) =20 ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] @@ -3700,8 +3744,8 @@ summary_info +=3D {'l2tpv3 support': have_l2tpv3} summary_info +=3D {'Linux AIO support': libaio} summary_info +=3D {'Linux io_uring support': linux_io_uring} summary_info +=3D {'ATTR/XATTR support': libattr} -summary_info +=3D {'RDMA support': config_host.has_key('CONFIG_RDMA')} -summary_info +=3D {'PVRDMA support': config_host.has_key('CONFIG_PVRDMA= ')} +summary_info +=3D {'RDMA support': rdma} +summary_info +=3D {'PVRDMA support': have_pvrdma} summary_info +=3D {'fdt support': fdt_opt =3D=3D 'disabled' ? false = : fdt_opt} summary_info +=3D {'libcap-ng support': libcap_ng} summary_info +=3D {'bpf support': libbpf} diff --git a/meson_options.txt b/meson_options.txt index dbcf9722bb..3bdf409497 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -151,6 +151,10 @@ option('rbd', type : 'feature', value : 'auto', description: 'Ceph block device driver') option('opengl', type : 'feature', value : 'auto', description: 'OpenGL support') +option('rdma', type : 'feature', value : 'auto', + description: 'Enable RDMA-based migration') +option('pvrdma', type : 'feature', value : 'auto', + description: 'Enable PVRDMA support') option('gtk', type : 'feature', value : 'auto', description: 'GTK+ user interface') option('sdl', type : 'feature', value : 'auto', diff --git a/migration/meson.build b/migration/meson.build index 8b5ca5c047..6880b61b10 100644 --- a/migration/meson.build +++ b/migration/meson.build @@ -27,7 +27,7 @@ softmmu_ss.add(files( 'tls.c', ), gnutls) =20 -softmmu_ss.add(when: ['CONFIG_RDMA', rdma], if_true: files('rdma.c')) +softmmu_ss.add(when: rdma, if_true: files('rdma.c')) if get_option('live_block_migration').allowed() softmmu_ss.add(files('block.c')) endif diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 203f33ae18..838aa38df9 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -96,10 +96,12 @@ meson_options_help() { printf "%s\n" ' pa PulseAudio sound support' printf "%s\n" ' parallels parallels image format support' printf "%s\n" ' png PNG support with libpng' + printf "%s\n" ' pvrdma Enable PVRDMA support' printf "%s\n" ' qcow1 qcow1 image format support' printf "%s\n" ' qed qed image format support' printf "%s\n" ' qga-vss build QGA VSS support (broken with MinG= W)' printf "%s\n" ' rbd Ceph block device driver' + printf "%s\n" ' rdma Enable RDMA-based migration' printf "%s\n" ' replication replication support' printf "%s\n" ' sdl SDL user interface' printf "%s\n" ' sdl-image SDL Image support for icons' @@ -284,6 +286,8 @@ _meson_option_parse() { --disable-png) printf "%s" -Dpng=3Ddisabled ;; --enable-profiler) printf "%s" -Dprofiler=3Dtrue ;; --disable-profiler) printf "%s" -Dprofiler=3Dfalse ;; + --enable-pvrdma) printf "%s" -Dpvrdma=3Denabled ;; + --disable-pvrdma) printf "%s" -Dpvrdma=3Ddisabled ;; --enable-qcow1) printf "%s" -Dqcow1=3Denabled ;; --disable-qcow1) printf "%s" -Dqcow1=3Ddisabled ;; --enable-qed) printf "%s" -Dqed=3Denabled ;; @@ -294,6 +298,8 @@ _meson_option_parse() { --disable-qom-cast-debug) printf "%s" -Dqom_cast_debug=3Dfalse ;; --enable-rbd) printf "%s" -Drbd=3Denabled ;; --disable-rbd) printf "%s" -Drbd=3Ddisabled ;; + --enable-rdma) printf "%s" -Drdma=3Denabled ;; + --disable-rdma) printf "%s" -Drdma=3Ddisabled ;; --enable-replication) printf "%s" -Dreplication=3Denabled ;; --disable-replication) printf "%s" -Dreplication=3Ddisabled ;; --enable-rng-none) printf "%s" -Drng_none=3Dtrue ;; --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131373154471.27484318635663; Thu, 28 Apr 2022 00:36:13 -0700 (PDT) Received: from localhost ([::1]:48944 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyhA-0005hK-5C for importer@patchew.org; Thu, 28 Apr 2022 03:36:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51164) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2A-0000QC-CA for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:51 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:37426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy28-00056l-KX for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:50 -0400 Received: by mail-ej1-x636.google.com with SMTP id kq17so7616120ejb.4 for ; Wed, 27 Apr 2022 23:53:48 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zPQYNiftf2Z/JiZej30s+Ptwf5BUJp63ZugvmeNyfg4=; b=M79tzIR70tUAxZUcsR3JHT7kul3bv6XsVa8zZ5DpQOWyEqgtc3DYuosZbcLZUz9VVV TAH4/xxMwx3OGlpjWgikcBJjG1U7m19+zAiBzI6/kZr17BsRMx+b3EgY8XR8JQUeNXyh kGrTMhQ3o+lGYhsNKJ9KxfFVeWvWtB63SLJHchnduYZjShcSU8asRRDrW3LDceT1uRwp xrgeVuQoiHR9z3axwweUa8xRennZ9FCTwo2EUf3xJK/SMKioGTWxPuPFj2Cgq/CK9R2u KGMo0znmvdtN2fkTeUMZf6hho1mkSIOwFZU1wT2QTXFR5oVJFYSyi5fgmEBPYz4dN8Sb AyXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=zPQYNiftf2Z/JiZej30s+Ptwf5BUJp63ZugvmeNyfg4=; b=qxp+vz4NyYncLt8cMdguliLJgBOhVYPjStd3S77GeKYq9wAKJRYSBBNa4t+SwXh+2i WXS+vvqHYN0pdXGwNhX8Qt/9d3Q+tBAmXu6eNw6ctcaBg7+kha1+JBrLZvXLkjgqSvXK m9Qm4Ep/9f7/XF5BEdtXd/EQ6NzTI/TKxWmkUcXFjjoJ3Tj/wsMHHZLBMgBaLiiEoiM8 txt1l+lmg6NR160uLKcqZOxx9sglwXI4gULsd0P7au3+G6SEU2oSdNHh91VfU/TJBPeO NtWj6imlP+gtdpDV0BWxpccz83ddfdSUyuCaemt2YDWIw4SbY4d5koGGmhXC2zU2dH6U 16bA== X-Gm-Message-State: AOAM531qjRGC/lAdF303Yif66UfLjfubqt5kHKhuws812PBJRN+V+Eop tXReZU7yNy3tNNVrLiKLgvAwAfWwhrPwtw== X-Google-Smtp-Source: ABdhPJyCvzUHmWEjb+K1WUKJ4LiSCSZMa5NRf+gPgjYmfzMate1uN9VUfWxVWdRUhcElOxFpXH584g== X-Received: by 2002:a17:907:c02:b0:6df:fb64:2770 with SMTP id ga2-20020a1709070c0200b006dffb642770mr31638325ejc.221.1651128827262; Wed, 27 Apr 2022 23:53:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/18] meson, configure: move keyctl test to meson Date: Thu, 28 Apr 2022 08:53:30 +0200 Message-Id: <20220428065335.189795-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131375008100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 44 ----------------------------------- crypto/meson.build | 4 +++- meson.build | 15 +++++++++++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 5 files changed, 22 insertions(+), 46 deletions(-) diff --git a/configure b/configure index 4deca94235..313579019d 100755 --- a/configure +++ b/configure @@ -322,7 +322,6 @@ trace_file=3D"trace" coroutine=3D"" tls_priority=3D"NORMAL" plugins=3D"$default_feature" -secret_keyring=3D"$default_feature" meson=3D"" meson_args=3D"" ninja=3D"" @@ -1009,10 +1008,6 @@ for opt do ;; --gdb=3D*) gdb_bin=3D"$optarg" ;; - --enable-keyring) secret_keyring=3D"yes" - ;; - --disable-keyring) secret_keyring=3D"no" - ;; --enable-gio) gio=3Dyes ;; --disable-gio) gio=3Dno @@ -2440,41 +2435,6 @@ case "$slirp" in ;; esac =20 -########################################## -# check for usable __NR_keyctl syscall - -if test "$linux" =3D "yes" ; then - - have_keyring=3Dno - cat > $TMPC << EOF -#include -#include -#include -#include -int main(void) { - return syscall(__NR_keyctl, KEYCTL_READ, 0, NULL, NULL, 0); -} -EOF - if compile_prog "" "" ; then - have_keyring=3Dyes - fi -fi -if test "$secret_keyring" !=3D "no" -then - if test "$have_keyring" =3D "yes" - then - secret_keyring=3Dyes - else - if test "$secret_keyring" =3D "yes" - then - error_exit "syscall __NR_keyctl requested, \ -but not implemented on your system" - else - secret_keyring=3Dno - fi - fi -fi - ########################################## # End of CC checks # After here, no more $cc or $ld runs @@ -2760,10 +2720,6 @@ if test -n "$gdb_bin"; then fi fi =20 -if test "$secret_keyring" =3D "yes" ; then - echo "CONFIG_SECRET_KEYRING=3Dy" >> $config_host_mak -fi - echo "ROMS=3D$roms" >> $config_host_mak echo "MAKE=3D$make" >> $config_host_mak echo "PYTHON=3D$python" >> $config_host_mak diff --git a/crypto/meson.build b/crypto/meson.build index 19c44bea89..f065f2f277 100644 --- a/crypto/meson.build +++ b/crypto/meson.build @@ -34,7 +34,9 @@ else crypto_ss.add(files('hash-glib.c', 'hmac-glib.c', 'pbkdf-stub.c')) endif =20 -crypto_ss.add(when: 'CONFIG_SECRET_KEYRING', if_true: files('secret_keyrin= g.c')) +if have_keyring + crypto_ss.add(files('secret_keyring.c')) +endif if have_afalg crypto_ss.add(if_true: files('afalg.c', 'cipher-afalg.c', 'hash-afalg.c'= )) endif diff --git a/meson.build b/meson.build index 9c03436756..64161dffe7 100644 --- a/meson.build +++ b/meson.build @@ -1940,6 +1940,19 @@ config_host_data.set('CONFIG_GETAUXVAL', cc.links(gn= u_source_prefix + ''' return getauxval(AT_HWCAP) =3D=3D 0; }''')) =20 +have_keyring =3D get_option('keyring') \ + .require(targetos =3D=3D 'linux', error_message: 'keyring is only availa= ble on Linux') \ + .require(cc.compiles(''' + #include + #include + #include + #include + #include + int main(void) { + return syscall(__NR_keyctl, KEYCTL_READ, 0, NULL, NULL, 0); + }'''), error_message: 'keyctl syscall not available on this system').a= llowed() +config_host_data.set('CONFIG_SECRET_KEYRING', have_keyring) + have_cpuid_h =3D cc.links(''' #include int main(void) { @@ -3698,7 +3711,7 @@ if nettle.found() endif summary_info +=3D {'AF_ALG support': have_afalg} summary_info +=3D {'rng-none': get_option('rng_none')} -summary_info +=3D {'Linux keyring': config_host.has_key('CONFIG_SECRET= _KEYRING')} +summary_info +=3D {'Linux keyring': have_keyring} summary(summary_info, bool_yn: true, section: 'Crypto') =20 # Libraries diff --git a/meson_options.txt b/meson_options.txt index 3bdf409497..8efdd0193a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -90,6 +90,8 @@ option('avx2', type: 'feature', value: 'auto', description: 'AVX2 optimizations') option('avx512f', type: 'feature', value: 'disabled', description: 'AVX512F optimizations') +option('keyring', type: 'feature', value: 'auto', + description: 'Linux keyring support') =20 option('attr', type : 'feature', value : 'auto', description: 'attr/xattr support') diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 838aa38df9..3ba4aaf132 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -68,6 +68,7 @@ meson_options_help() { printf "%s\n" ' hvf HVF acceleration support' printf "%s\n" ' iconv Font glyph conversion support' printf "%s\n" ' jack JACK sound support' + printf "%s\n" ' keyring Linux keyring support' printf "%s\n" ' kvm KVM acceleration support' printf "%s\n" ' l2tpv3 l2tpv3 network backend support' printf "%s\n" ' libdaxctl libdaxctl support' @@ -229,6 +230,8 @@ _meson_option_parse() { --disable-install-blobs) printf "%s" -Dinstall_blobs=3Dfalse ;; --enable-jack) printf "%s" -Djack=3Denabled ;; --disable-jack) printf "%s" -Djack=3Ddisabled ;; + --enable-keyring) printf "%s" -Dkeyring=3Denabled ;; + --disable-keyring) printf "%s" -Dkeyring=3Ddisabled ;; --enable-kvm) printf "%s" -Dkvm=3Denabled ;; --disable-kvm) printf "%s" -Dkvm=3Ddisabled ;; --enable-l2tpv3) printf "%s" -Dl2tpv3=3Denabled ;; --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131840972787.7826560268932; Thu, 28 Apr 2022 00:44:00 -0700 (PDT) Received: from localhost ([::1]:34054 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyoh-00074T-DO for importer@patchew.org; Thu, 28 Apr 2022 03:43:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2D-0000SU-U8 for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:54 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:40490) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy2C-00057j-Bu for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:53 -0400 Received: by mail-ej1-x636.google.com with SMTP id l18so7593555ejc.7 for ; Wed, 27 Apr 2022 23:53:51 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dssSWM493xy0rMyl8qHyVLudLAho+fC1PyDd65Xf9oU=; b=bvc3enIKqL+zCCY0r6znEb6+YxfxIcsyWZttRynexgV3pX+LS7daSFpkG9sIqPcWmg v/D7/64XpUXPeaDLlKIpcSz9V6h1JcdwCEZEfFHuadYkvJn7MAq+GEOtt5SZtcg4OB5f GeWXLJ8NrcJbjYbIWVcfNMQNqeqn4NY7n9vrAuNmvIoFipN7GzSWERN4ZvyobIXaJVrv YT+6YoObnPhh009XGT17LVs3u1gCoam1Mx1/o3+s9oxRuk7IsJrYFk//4v3qjeymTUc1 yCBEA1QDjchFQthpeAw/hvu2LLGmz4sPW29Srt+04VMi96fCtwlMBUFk37LISJHom6jv raow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=dssSWM493xy0rMyl8qHyVLudLAho+fC1PyDd65Xf9oU=; b=auqcFNej73ZKf3drg6i9jgCZPQ7EsIg9bzCyzqy1rXBOiW89GK3GdRG82bQw/U4joY wcQHv3SSxOzeLSt7q3JHj3CAcH1ALbMenG89yqDzpXx2y0pdnC4N14zYX56FlMLrx5uV /mvTNqbe2APBNNRO/T6XZxbRU3Y9hbDkTuhi2uI5gLmoOmmN72Gm2AK60jwH3riNcsAl q+Znwkn0blZk4fRoWPZtdS7AnqaWJi+/RY4To1lpOLv3tmjcrQoZKLo05LdEuRlFrAAN X5X0IFWR0NLmtxoI/LtrS7C2Nbik2ZzGpmgNN4dAdJH4TPLY6HcCmiXN+Rt3womDwvWQ Edfw== X-Gm-Message-State: AOAM531X373Ee/oiNoChebdaDj18zSPPSJW8n8dCflAoBpI35ob/PzOw usK5xZr8SnW/StBg9e4iObzJIgyIGnekNg== X-Google-Smtp-Source: ABdhPJwz/kMvpFO9hJccme5fXs4RiylgXoFQH3cLKrlFwjxbZ9SxK715YAIPMJVtmRGRQqnVV0yLMw== X-Received: by 2002:a17:906:7c96:b0:6f3:b6c4:7b2 with SMTP id w22-20020a1709067c9600b006f3b6c407b2mr10978277ejo.676.1651128828434; Wed, 27 Apr 2022 23:53:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/18] meson, configure: move usbfs test to meson Date: Thu, 28 Apr 2022 08:53:31 +0200 Message-Id: <20220428065335.189795-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131843671100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 28 ---------------------------- meson.build | 13 +++++++++++++ 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 313579019d..d527a9c22e 100755 --- a/configure +++ b/configure @@ -2160,31 +2160,6 @@ case "$fdt" in ;; esac =20 -########################################## -# check for usbfs -have_usbfs=3Dno -if test "$linux_user" =3D "yes"; then - cat > $TMPC << EOF -#include - -#ifndef USBDEVFS_GET_CAPABILITIES -#error "USBDEVFS_GET_CAPABILITIES undefined" -#endif - -#ifndef USBDEVFS_DISCONNECT_CLAIM -#error "USBDEVFS_DISCONNECT_CLAIM undefined" -#endif - -int main(void) -{ - return 0; -} -EOF - if compile_prog "" ""; then - have_usbfs=3Dyes - fi -fi - ########################################## # capstone =20 @@ -2641,9 +2616,6 @@ fi if test "$module_upgrades" =3D "yes"; then echo "CONFIG_MODULE_UPGRADES=3Dy" >> $config_host_mak fi -if test "$have_usbfs" =3D "yes" ; then - echo "CONFIG_USBFS=3Dy" >> $config_host_mak -fi if test "$gio" =3D "yes" ; then echo "CONFIG_GIO=3Dy" >> $config_host_mak echo "GIO_CFLAGS=3D$gio_cflags" >> $config_host_mak diff --git a/meson.build b/meson.build index 64161dffe7..c99b28a5ef 100644 --- a/meson.build +++ b/meson.build @@ -1940,6 +1940,19 @@ config_host_data.set('CONFIG_GETAUXVAL', cc.links(gn= u_source_prefix + ''' return getauxval(AT_HWCAP) =3D=3D 0; }''')) =20 +config_host_data.set('CONFIG_USBFS', have_linux_user and cc.compiles(''' + #include + + #ifndef USBDEVFS_GET_CAPABILITIES + #error "USBDEVFS_GET_CAPABILITIES undefined" + #endif + + #ifndef USBDEVFS_DISCONNECT_CLAIM + #error "USBDEVFS_DISCONNECT_CLAIM undefined" + #endif + + int main(void) { return 0; }''')) + have_keyring =3D get_option('keyring') \ .require(targetos =3D=3D 'linux', error_message: 'keyring is only availa= ble on Linux') \ .require(cc.compiles(''' --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651132268227234.0559172913804; Thu, 28 Apr 2022 00:51:08 -0700 (PDT) Received: from localhost ([::1]:42548 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyva-0004g2-D6 for importer@patchew.org; Thu, 28 Apr 2022 03:51:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51206) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2E-0000SV-8w for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:55 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:44572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy2C-000578-4E for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:53 -0400 Received: by mail-ej1-x632.google.com with SMTP id i19so7571377eja.11 for ; Wed, 27 Apr 2022 23:53:51 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QX6/qosMko92rV11J5BGgNOcKBZZNCHyWq7MkNluS98=; b=TmiO7Hp3JF0c97ZH0XhOpRiDouTZsleEci3/j8DhllRjQODurQKLQJj6DQ9Z+O4Yzz L1x5QVGizEguzi01iWe0OL1cfLrpPUHyIV10PDLFDScxUj/Xk4z56HWiAJcgb3+f5zK6 znSPiVHpWYV3qIP682TyJVzKRiG8WTVEYbVHKLIBlRQKI0l4NORMfotVBlEwN/1oQ7Ca bfNwAQEuqw9Akkpd4XIfaFdEqFomhkPEXb8yXQ1xjZ8wxlt9kIOE13iUWbN/A5BexYFe kucTNUSQevX7lR69TQalYvJg7Rf31roeuPDRfcHqIy6fo9D0JHGek/qu42lj7MVVPL1J qtmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=QX6/qosMko92rV11J5BGgNOcKBZZNCHyWq7MkNluS98=; b=vdXsZonynUVhFYbQFAjqE5lKyYv6Khoo+I4PZT6RkN3V/cJav90Zit90CMHMjA3yZU na6Fr873sAgX3U/WRJyY8YAi9WUdU730+2J9t1w39SI0krvblGj7h6ApaGSo+wUNAQuG SRNdqegyPGYzav5s4oVOHrWp/QfIgIrQDmymcJuhds2w0k+zbZzjghVLbLFNKgWyXAZh UN0FEsSQUdfw0BS2XrYk13FZNvIoF4Gxg5t8zVbW5goHHCPMV1W4t9V+P8MbDZ8VDu4Q AaxGxRzVPhSCGGgt6x/eUaoax9nVZTz5xkqh2dpcgMjvWY/V7cjVarhI715wFGBVwyI8 0V2g== X-Gm-Message-State: AOAM533PEvtKGKM14U/EivJ54MJfWo9CXyo70saZlfcFTcFZdgrKm9O3 oj8eFRpPRNJ/JZlfBwYiy53IWMul3xSRDA== X-Google-Smtp-Source: ABdhPJw7t+uGVNHU8xQu1Yw2dUVXnfF76fpT1yWyz5COO6msbBZYiB3r5an9o5INwYQ0Rg+SuCZdzw== X-Received: by 2002:a17:907:1c9b:b0:6f3:833c:2816 with SMTP id nb27-20020a1709071c9b00b006f3833c2816mr22844295ejc.601.1651128830683; Wed, 27 Apr 2022 23:53:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/18] meson, configure: move libgio test to meson Date: Thu, 28 Apr 2022 08:53:32 +0200 Message-Id: <20220428065335.189795-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::632; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651132270534100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- backends/meson.build | 2 +- configure | 58 ----------------------------------- meson.build | 32 ++++++++++++++++--- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 ++ tests/qtest/meson.build | 5 ++- ui/meson.build | 7 ++--- util/meson.build | 2 +- 8 files changed, 39 insertions(+), 72 deletions(-) diff --git a/backends/meson.build b/backends/meson.build index 6e68945528..535c3ca7dd 100644 --- a/backends/meson.build +++ b/backends/meson.build @@ -15,7 +15,7 @@ softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('host= mem-memfd.c')) softmmu_ss.add(when: ['CONFIG_VHOST_USER', 'CONFIG_VIRTIO'], if_true: file= s('vhost-user.c')) softmmu_ss.add(when: 'CONFIG_VIRTIO_CRYPTO', if_true: files('cryptodev-vho= st.c')) softmmu_ss.add(when: ['CONFIG_VIRTIO_CRYPTO', 'CONFIG_VHOST_CRYPTO'], if_t= rue: files('cryptodev-vhost-user.c')) -softmmu_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus-vmstate.c'), gio]) +softmmu_ss.add(when: gio, if_true: files('dbus-vmstate.c')) softmmu_ss.add(when: 'CONFIG_SGX', if_true: files('hostmem-epc.c')) =20 subdir('tpm') diff --git a/configure b/configure index d527a9c22e..1fb70bf614 100755 --- a/configure +++ b/configure @@ -325,7 +325,6 @@ plugins=3D"$default_feature" meson=3D"" meson_args=3D"" ninja=3D"" -gio=3D"$default_feature" skip_meson=3Dno =20 # The following Meson options are handled manually (still they @@ -1008,10 +1007,6 @@ for opt do ;; --gdb=3D*) gdb_bin=3D"$optarg" ;; - --enable-gio) gio=3Dyes - ;; - --disable-gio) gio=3Dno - ;; # backwards compatibility options --enable-trace-backend=3D*) meson_option_parse "--enable-trace-backends= =3D$optarg" "$optarg" ;; @@ -1236,7 +1231,6 @@ cat << EOF vhost-kernel vhost kernel backend support vhost-user vhost-user backend support vhost-vdpa vhost-vdpa kernel backend support - gio libgio support =20 NOTE: The object files are built at the place where configure is launched EOF @@ -2047,50 +2041,6 @@ if test "$static" =3D yes && test "$mingw32" =3D yes= ; then glib_cflags=3D"-DGLIB_STATIC_COMPILATION $glib_cflags" fi =20 -if ! test "$gio" =3D "no"; then - pass=3Dno - if $pkg_config --atleast-version=3D$glib_req_ver gio-2.0; then - gio_cflags=3D$($pkg_config --cflags gio-2.0) - gio_libs=3D$($pkg_config --libs gio-2.0) - gdbus_codegen=3D$($pkg_config --variable=3Dgdbus_codegen gio-2.0) - if ! has "$gdbus_codegen"; then - gdbus_codegen=3D - fi - # Check that the libraries actually work -- Ubuntu 18.04 ships - # with pkg-config --static --libs data for gio-2.0 that is missing - # -lblkid and will give a link error. - cat > $TMPC < -int main(void) -{ - g_dbus_proxy_new_sync(0, 0, 0, 0, 0, 0, 0, 0); - return 0; -} -EOF - if compile_prog "$gio_cflags" "$gio_libs" ; then - pass=3Dyes - else - pass=3Dno - fi - - if test "$pass" =3D "yes" && - $pkg_config --atleast-version=3D$glib_req_ver gio-unix-2.0; th= en - gio_cflags=3D"$gio_cflags $($pkg_config --cflags gio-unix-2.0)" - gio_libs=3D"$gio_libs $($pkg_config --libs gio-unix-2.0)" - fi - fi - - if test "$pass" =3D "no"; then - if test "$gio" =3D "yes"; then - feature_not_found "gio" "Install libgio >=3D 2.0" - else - gio=3Dno - fi - else - gio=3Dyes - fi -fi - # Sanity check that the current size_t matches the # size that glib thinks it should be. This catches # problems on multi-arch where people try to build @@ -2616,14 +2566,6 @@ fi if test "$module_upgrades" =3D "yes"; then echo "CONFIG_MODULE_UPGRADES=3Dy" >> $config_host_mak fi -if test "$gio" =3D "yes" ; then - echo "CONFIG_GIO=3Dy" >> $config_host_mak - echo "GIO_CFLAGS=3D$gio_cflags" >> $config_host_mak - echo "GIO_LIBS=3D$gio_libs" >> $config_host_mak -fi -if test "$gdbus_codegen" !=3D "" ; then - echo "GDBUS_CODEGEN=3D$gdbus_codegen" >> $config_host_mak -fi echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak =20 if test "$xen" =3D "enabled" ; then diff --git a/meson.build b/meson.build index c99b28a5ef..9f2a12e1cf 100644 --- a/meson.build +++ b/meson.build @@ -448,11 +448,32 @@ glib =3D declare_dependency(compile_args: config_host= ['GLIB_CFLAGS'].split(), meson.override_dependency('glib-2.0', glib) =20 gio =3D not_found -if 'CONFIG_GIO' in config_host - gio =3D declare_dependency(compile_args: config_host['GIO_CFLAGS'].split= (), - link_args: config_host['GIO_LIBS'].split(), - version: config_host['GLIB_VERSION']) +gdbus_codegen =3D not_found +if not get_option('gio').auto() or have_system + gio =3D dependency('gio-2.0', required: get_option('gio'), + method: 'pkg-config', kwargs: static_kwargs) + if gio.found() and not cc.links(''' + #include + int main(void) + { + g_dbus_proxy_new_sync(0, 0, 0, 0, 0, 0, 0, 0); + return 0; + }''', dependencies: [glib, gio]) + if get_option('gio').enabled() + error('The installed libgio is broken for static linking') + endif + gio =3D not_found + endif + if gio.found() + gdbus_codegen =3D find_program(gio.get_variable('gdbus_codegen'), + required: get_option('gio')) + gio_unix =3D dependency('gio-unix-2.0', required: get_option('gio'), + method: 'pkg-config', kwargs: static_kwargs) + gio =3D declare_dependency(dependencies: [gio, gio_unix], + version: gio.version()) + endif endif + lttng =3D not_found if 'ust' in get_option('trace_backends') lttng =3D dependency('lttng-ust', required: true, version: '>=3D 2.1', @@ -1480,7 +1501,7 @@ dbus_display =3D get_option('dbus_display') \ error_message: '-display dbus requires glib>=3D2.64') \ .require(enable_modules, error_message: '-display dbus requires --enable-modules') \ - .require(config_host.has_key('GDBUS_CODEGEN'), + .require(gdbus_codegen.found(), error_message: '-display dbus requires gdbus-codegen') \ .allowed() =20 @@ -1542,6 +1563,7 @@ config_host_data.set('CONFIG_MPATH_NEW_API', mpathper= sist_new_api) config_host_data.set('CONFIG_CURL', curl.found()) config_host_data.set('CONFIG_CURSES', curses.found()) config_host_data.set('CONFIG_GBM', gbm.found()) +config_host_data.set('CONFIG_GIO', gio.found()) config_host_data.set('CONFIG_GLUSTERFS', glusterfs.found()) if glusterfs.found() config_host_data.set('CONFIG_GLUSTERFS_XLATOR_OPT', glusterfs.version().= version_compare('>=3D4')) diff --git a/meson_options.txt b/meson_options.txt index 8efdd0193a..65f7010bae 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -109,6 +109,8 @@ option('cocoa', type : 'feature', value : 'auto', description: 'Cocoa user interface (macOS only)') option('curl', type : 'feature', value : 'auto', description: 'CURL block device driver') +option('gio', type : 'feature', value : 'auto', + description: 'use libgio for D-Bus support') option('glusterfs', type : 'feature', value : 'auto', description: 'Glusterfs block device driver') option('libiscsi', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3ba4aaf132..ee80f01cea 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -59,6 +59,7 @@ meson_options_help() { printf "%s\n" ' fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE ex= ports' printf "%s\n" ' gcrypt libgcrypt cryptography support' printf "%s\n" ' gettext Localization of the GTK+ user interface' + printf "%s\n" ' gio use libgio for D-Bus support' printf "%s\n" ' glusterfs Glusterfs block device driver' printf "%s\n" ' gnutls GNUTLS cryptography support' printf "%s\n" ' gtk GTK+ user interface' @@ -208,6 +209,8 @@ _meson_option_parse() { --disable-gcrypt) printf "%s" -Dgcrypt=3Ddisabled ;; --enable-gettext) printf "%s" -Dgettext=3Denabled ;; --disable-gettext) printf "%s" -Dgettext=3Ddisabled ;; + --enable-gio) printf "%s" -Dgio=3Denabled ;; + --disable-gio) printf "%s" -Dgio=3Ddisabled ;; --enable-glusterfs) printf "%s" -Dglusterfs=3Denabled ;; --disable-glusterfs) printf "%s" -Dglusterfs=3Ddisabled ;; --enable-gnutls) printf "%s" -Dgnutls=3Denabled ;; diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 22e1361210..6b9807c183 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -98,14 +98,13 @@ if dbus_display endif =20 dbus_daemon =3D find_program('dbus-daemon', required: false) -if dbus_daemon.found() and config_host.has_key('GDBUS_CODEGEN') +if dbus_daemon.found() and gdbus_codegen.found() # Temporarily disabled due to Patchew failures: #qtests_i386 +=3D ['dbus-vmstate-test'] dbus_vmstate1 =3D custom_target('dbus-vmstate description', output: ['dbus-vmstate1.h', 'dbus-vmstate1= .c'], input: meson.project_source_root() / 'back= ends/dbus-vmstate1.xml', - command: [config_host['GDBUS_CODEGEN'], - '@INPUT@', + command: [gdbus_codegen, '@INPUT@', '--interface-prefix', 'org.qemu', '--generate-c-code', '@BASENAME@= ']).to_list() else diff --git a/ui/meson.build b/ui/meson.build index b21d3d1534..eba93b41e3 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -74,14 +74,13 @@ if dbus_display dbus_display1 =3D custom_target('dbus-display gdbus-codegen', output: ['dbus-display1.h', 'dbus-display1= .c'], input: files('dbus-display1.xml'), - command: [config_host['GDBUS_CODEGEN'], - '@INPUT@', + command: [gdbus_codegen, '@INPUT@', '--glib-min-required', '2.64', '--output-directory', meson.curr= ent_build_dir(), '--interface-prefix', 'org.qemu.= ', '--c-namespace', 'QemuDBus', '--generate-c-code', '@BASENAME@= ']) - dbus_ss.add(when: [gio, pixman, opengl, 'CONFIG_GIO'], + dbus_ss.add(when: [gio, pixman, opengl], if_true: [files( 'dbus-chardev.c', 'dbus-clipboard.c', @@ -128,7 +127,7 @@ if spice.found() ui_modules +=3D {'spice-core' : spice_core_ss} endif =20 -if spice.found() and config_host.has_key('CONFIG_GIO') +if spice.found() and gio.found() spice_ss =3D ss.source_set() spice_ss.add(spice, gio, pixman, files('spice-app.c')) ui_modules +=3D {'spice-app': spice_ss} diff --git a/util/meson.build b/util/meson.build index 82eec004e2..8f16018cd4 100644 --- a/util/meson.build +++ b/util/meson.build @@ -61,7 +61,7 @@ endif =20 if have_system util_ss.add(files('crc-ccitt.c')) - util_ss.add(when: 'CONFIG_GIO', if_true: [files('dbus.c'), gio]) + util_ss.add(when: gio, if_true: files('dbus.c')) util_ss.add(when: 'CONFIG_LINUX', if_true: files('userfaultfd.c')) endif =20 --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131615062732.1579319884812; Thu, 28 Apr 2022 00:40:15 -0700 (PDT) Received: from localhost ([::1]:55014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njyl3-00026B-Un for importer@patchew.org; Thu, 28 Apr 2022 03:40:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2F-0000TE-6K for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:55 -0400 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:34580) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy2C-00058I-TQ for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:54 -0400 Received: by mail-ej1-x62e.google.com with SMTP id g6so7638984ejw.1 for ; Wed, 27 Apr 2022 23:53:52 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aUsUzSQHyxKD1UsgzavpnogZrGGe+ChKRf/EREH9irg=; b=WJwhIcy8oNmQzus71WDUtBB4VKXelrlKlvNt65PHFLYTFddWTvKk6fki3+1le3ahFX hxoOMgGnyI00DoD5aIhxMIviqBiP72ehhNJ40nlHyiKPKl3DktGN1Y1JCKbOItHuawER R4iJDMa7ajAaW03X4lMzpT1wFpv4MAO9D/8WSmkn7DrQxTMk8tuJhugVX/IU8jEHQs4T W0KtJYRgQyFXeBrP07sqD+QlClMFW9WL+IFLnLCYwa34Xv2ZEQ+9qJfGPWNwevsYh2bJ MLeP/F7VSJ6pGap/LPfCzWv+g5PzF4zYDvGnCrObjOmugblEjAL4NHt+qhKZ4rbnQ5eI 5sNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=aUsUzSQHyxKD1UsgzavpnogZrGGe+ChKRf/EREH9irg=; b=1iJYD1YwyYavuiBQK1rthozLyZu7aklMVuH1t1ZfYgbPFIg3coQMpPElr/wPHJsc6l eiUFCYgu/xCoWD6gfdOtvWyUVIbQ6iB3I8sHhbZAE+lKQNVW18CfTu97E76Mnozo/Om/ g/7IiTbclxTSHWHxk2HcwjlOmNOQSzjcqcYQcjx5yB0YLmoadM0C+mNWAtHuJW6YlRd7 Al6H5Vaz9sUiVK6TgAFkzmnap6WzgRs/mMA3nZ8fQZiTxhFzLRFUJ9z/VL94V+AUmG6w wlCnwrjCWPkExPGp1aB/D77sXIdozGILffroXLLSSOtBmE1Gx2oBkvYgRlULDoy2D69l KQbw== X-Gm-Message-State: AOAM532u2jfkrwJ8As0tdAnMxp6N2Qty/4Yuuf8qZUHBcLUO7kvIJ6Yp vLdNeYO9CnV+8fBjScj42WAGmnlPZE6gDQ== X-Google-Smtp-Source: ABdhPJyXi89TRZ8TxiXp9beaFKBxnIdISUNOc6FZviJPMYn9qiVHx14z8CL6GuR57o9onBbQHkGyrQ== X-Received: by 2002:a17:907:969f:b0:6f3:dede:f2d2 with SMTP id hd31-20020a170907969f00b006f3dedef2d2mr1703286ejc.511.1651128831338; Wed, 27 Apr 2022 23:53:51 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/18] meson: remove CONFIG_XEN_PCI_PASSTHROUGH from config-target.h Date: Thu, 28 Apr 2022 08:53:33 +0200 Message-Id: <20220428065335.189795-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-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=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131615496100001 Content-Type: text/plain; charset="utf-8" CONFIG_XEN_PCI_PASSTHROUGH is just a global configuration option; it is never used in the source files, so there is no need to put CONFIG_XEN_PCI_PASSTHROUGH in config-target.h or even in config-host.h. This inaccuracy was copied over from the configure script in commit 8a19980e3f ("configure: move accelerator logic to meson", 2020-10-03). Signed-off-by: Paolo Bonzini --- hw/xen/meson.build | 20 ++++++++++++-------- meson.build | 2 -- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/hw/xen/meson.build b/hw/xen/meson.build index 076954b89c..08dc1f6857 100644 --- a/hw/xen/meson.build +++ b/hw/xen/meson.build @@ -8,13 +8,17 @@ softmmu_ss.add(when: ['CONFIG_XEN', xen], if_true: files( )) =20 xen_specific_ss =3D ss.source_set() -xen_specific_ss.add(when: 'CONFIG_XEN_PCI_PASSTHROUGH', if_true: files( - 'xen-host-pci-device.c', - 'xen_pt.c', - 'xen_pt_config_init.c', - 'xen_pt_graphics.c', - 'xen_pt_load_rom.c', - 'xen_pt_msi.c', -), if_false: files('xen_pt_stub.c')) +if have_xen_pci_passthrough + xen_specific_ss.add(files( + 'xen-host-pci-device.c', + 'xen_pt.c', + 'xen_pt_config_init.c', + 'xen_pt_graphics.c', + 'xen_pt_load_rom.c', + 'xen_pt_msi.c', + )) +else + xen_specific_ss.add('xen_pt_stub.c') +endif =20 specific_ss.add_all(when: ['CONFIG_XEN', xen], if_true: xen_specific_ss) diff --git a/meson.build b/meson.build index 9f2a12e1cf..ab1ac9b959 100644 --- a/meson.build +++ b/meson.build @@ -2242,8 +2242,6 @@ foreach target : target_dirs config_all +=3D { sym: 'y' } if sym =3D=3D 'CONFIG_TCG' and tcg_arch =3D=3D 'tci' config_target +=3D { 'CONFIG_TCG_INTERPRETER': 'y' } - elif sym =3D=3D 'CONFIG_XEN' and have_xen_pci_passthrough - config_target +=3D { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' } endif if target in modular_tcg config_target +=3D { 'CONFIG_TCG_MODULAR': 'y' } --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651131680170844.930278469678; Thu, 28 Apr 2022 00:41:20 -0700 (PDT) Received: from localhost ([::1]:57464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njym7-0003lt-4W for importer@patchew.org; Thu, 28 Apr 2022 03:41:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2F-0000TJ-Js for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:56 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:45962) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy2D-00058T-CI for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:55 -0400 Received: by mail-ej1-x635.google.com with SMTP id y3so7566848ejo.12 for ; Wed, 27 Apr 2022 23:53:53 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nPDUEcIQiysEsQ1ZLwh7qMFjmYPaWcbwmlZFyAXP/vg=; b=WbVWdb1uFJ1KBHxfQEB6/CYfhGwco3ct19nQ5JfaFT7GYrUH3qPEepqQ38TF7+2wLY qHRTgaFQwV8vQP3ReSCEIcOdWtM1f+ZUGAVxnPwdU0d8vK3tcAXoDfPNjKj3kgvx+Boe swb2LcSVbP+5NCvQO1tvt7iA+MVeUXZDibrlSN4nmyTnE1GvLbosNb9fOV3fnwlIEweF SQevrlm2En9xyJkDdwIvW7Qo1QavgD0PJmUg+2/7Oh5X95B/Ig4XV/u8JenfiN/yAyWy Tj92LLtTS6yUz/EQwE5+ezTmlOkWurkLAfXkBAIZxktjCnftIaKx+t4Bt8k64MFMAcGl 7I/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=nPDUEcIQiysEsQ1ZLwh7qMFjmYPaWcbwmlZFyAXP/vg=; b=3GKlDYAeeLYsxmZ/H6uMjwnRjPlsO4q7fp0OCNlzRr/uQooPLMG1NxteCg6rUZ4pky J2bd3KMUc8veZlz49NVRhAzUpqhUlN+bMmY6RIWA3slqM4TR1c28y7n7o14QmDZVyVHj 3XN/Q2WOGpj9LpiNRerBwFqpj1E0LWUEN7etCNWiUmNY+IKcmFC/9gMLwTO/tksIEyi1 V+Rer6Mw6jwlQF4qvhLh1Q81tN65HgdTPsvmFGK7Fo3jgJuuzC/c6L6eQfXxZHSDmlLl c1bAlntCcTAo78IZdO1uek9YJFhKDp7gNnTPUkYpwTFlTgvccu4KECxHTn7/mzVLAYwa RYvQ== X-Gm-Message-State: AOAM5304nuxK1oKUO2OcY9TKJmEW4ycpt48xatl23ybjeU3MnAKHD3hJ +uu4ZQkEYcB6VI5TCTedJkfBiZFr0QRu8w== X-Google-Smtp-Source: ABdhPJxUDpLrN5lj5j5YP5xdy7ihTc2iDTv+UhzSuAPtZpzP8S06AAPYjkgDZ+l0Aj8tZb421ARFNA== X-Received: by 2002:a17:907:3f07:b0:6f3:c0ee:d6a3 with SMTP id hq7-20020a1709073f0700b006f3c0eed6a3mr7685440ejc.410.1651128832059; Wed, 27 Apr 2022 23:53:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/18] meson, configure: move --enable-module-upgrades to meson Date: Thu, 28 Apr 2022 08:53:34 +0200 Message-Id: <20220428065335.189795-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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=2a00:1450:4864:20::635; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131682253100001 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 14 -------------- meson.build | 7 ++++++- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 4 ++++ 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 1fb70bf614..59c43bea05 100755 --- a/configure +++ b/configure @@ -310,7 +310,6 @@ fortify_source=3D"yes" gcov=3D"no" EXESUF=3D"" modules=3D"no" -module_upgrades=3D"no" prefix=3D"/usr/local" qemu_suffix=3D"qemu" softmmu=3D"yes" @@ -762,10 +761,6 @@ for opt do --disable-modules) modules=3D"no" ;; - --disable-module-upgrades) module_upgrades=3D"no" - ;; - --enable-module-upgrades) module_upgrades=3D"yes" - ;; --cpu=3D*) ;; --target-list=3D*) target_list=3D"$optarg" @@ -1218,7 +1213,6 @@ cat << EOF bsd-user all BSD usermode emulation targets pie Position Independent Executables modules modules support (non-Windows) - module-upgrades try to load modules from alternate paths for upgrades debug-tcg TCG debugging (default is disabled) debug-info debugging information lto Enable Link-Time Optimization. @@ -1487,11 +1481,6 @@ if test "$modules" =3D "yes" && test "$mingw32" =3D = "yes" ; then error_exit "Modules are not available for Windows" fi =20 -# module_upgrades is only reasonable if modules are enabled -if test "$modules" =3D "no" && test "$module_upgrades" =3D "yes" ; then - error_exit "Can't enable module-upgrades as Modules are not enabled" -fi - # Static linking is not possible with plugins, modules or PIE if test "$static" =3D "yes" ; then if test "$modules" =3D "yes" ; then @@ -2563,9 +2552,6 @@ if test "$modules" =3D "yes"; then echo "CONFIG_STAMP=3D_$( (echo $qemu_version; echo $pkgversion; cat $0) = | $shacmd - | cut -f1 -d\ )" >> $config_host_mak echo "CONFIG_MODULES=3Dy" >> $config_host_mak fi -if test "$module_upgrades" =3D "yes"; then - echo "CONFIG_MODULE_UPGRADES=3Dy" >> $config_host_mak -fi echo "CONFIG_TLS_PRIORITY=3D\"$tls_priority\"" >> $config_host_mak =20 if test "$xen" =3D "enabled" ; then diff --git a/meson.build b/meson.build index ab1ac9b959..1fe7d257ff 100644 --- a/meson.build +++ b/meson.build @@ -1550,6 +1550,11 @@ endif =20 config_host_data.set('HOST_' + host_arch.to_upper(), 1) =20 +if get_option('module_upgrades') and not enable_modules + error('Cannot enable module-upgrades as modules are not enabled') +endif +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()) @@ -3576,7 +3581,7 @@ summary_info +=3D {'block layer': have_block} summary_info +=3D {'Install blobs': get_option('install_blobs')} summary_info +=3D {'module support': config_host.has_key('CONFIG_MODULE= S')} if config_host.has_key('CONFIG_MODULES') - summary_info +=3D {'alternative module path': config_host.has_key('CONFI= G_MODULE_UPGRADES')} + summary_info +=3D {'alternative module path': get_option('module_upgrade= s')} endif summary_info +=3D {'fuzzing support': get_option('fuzzing')} if have_system diff --git a/meson_options.txt b/meson_options.txt index 65f7010bae..af432a4ee6 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -34,6 +34,8 @@ option('fuzzing', type : 'boolean', value: false, description: 'build fuzzing targets') option('gettext', type : 'feature', value : 'auto', description: 'Localization of the GTK+ user interface') +option('module_upgrades', type : 'boolean', value : false, + description: 'try to load modules from alternate paths for upgrades= ') option('install_blobs', type : 'boolean', value : true, description: 'install provided firmware blobs') option('sparse', type : 'feature', value : 'auto', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ee80f01cea..21366b2102 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -19,6 +19,8 @@ meson_options_help() { printf "%s\n" ' --disable-install-blobs install provided firmware blob= s' printf "%s\n" ' --enable-malloc=3DCHOICE choose memory allocator to u= se [system] (choices:' 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-profiler profiler support' printf "%s\n" ' --enable-qom-cast-debug cast debugging support' printf "%s\n" ' --enable-rng-none dummy RNG, avoid using /dev/(u= )random and' @@ -268,6 +270,8 @@ _meson_option_parse() { --disable-malloc-trim) printf "%s" -Dmalloc_trim=3Ddisabled ;; --enable-membarrier) printf "%s" -Dmembarrier=3Denabled ;; --disable-membarrier) printf "%s" -Dmembarrier=3Ddisabled ;; + --enable-module-upgrades) printf "%s" -Dmodule_upgrades=3Dtrue ;; + --disable-module-upgrades) printf "%s" -Dmodule_upgrades=3Dfalse ;; --enable-mpath) printf "%s" -Dmpath=3Denabled ;; --disable-mpath) printf "%s" -Dmpath=3Ddisabled ;; --enable-multiprocess) printf "%s" -Dmultiprocess=3Denabled ;; --=20 2.35.1 From nobody Sat May 18 09:22:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165113167299521.004609115179164; Thu, 28 Apr 2022 00:41:12 -0700 (PDT) Received: from localhost ([::1]:57148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1njylz-0003Vq-WF for importer@patchew.org; Thu, 28 Apr 2022 03:41:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1njy2F-0000TG-EC for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:55 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]:34584) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1njy2E-00058W-1C for qemu-devel@nongnu.org; Thu, 28 Apr 2022 02:53:55 -0400 Received: by mail-ej1-x632.google.com with SMTP id g6so7639064ejw.1 for ; Wed, 27 Apr 2022 23:53:53 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id jo11-20020a170906f6cb00b006f3955761c4sm5406804ejb.158.2022.04.27.23.53.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Apr 2022 23:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mo6RSwd4X5ZhQJ3X+x+w9UR6IaAzdNZ6WDjy6QIRSLY=; b=nsMwcOc2m5KDoomfTk4cozqKY7OY3Q/XPu8bPJDFmafwYk/bV60NCxjHlLM5oV5YhM qp8ffpGKNHL5Uq/qrUma9EGoVBytAnkQj9yUQuumVvSd2HARmlx6lQiMcNTwqXP+BrQ+ x56m+sAXf/w8DInhOj/9ybuAjmzT+X0U6MJmzXw7IWTN2u0EiHEaTx5mXQYjRZu5AVhd x8CTL+AogXITD1Z/cznrTlkBnjkBtHjeecilB5ODTYTPPnIY2Xs6TZsud6LM/cTRpfvK sYzYIghx1vITwPDcEgdtkAoyUzkIr0NeDbHbXb4wv0+UspyPPi84VmRfoAseFokT3+9B vyGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=mo6RSwd4X5ZhQJ3X+x+w9UR6IaAzdNZ6WDjy6QIRSLY=; b=rqRuSE3d20tEzY9PyDXf35sBXP/NTLqw9qC869BxTY2BwQJAJ4tWMskC7CeDuuZCEC /EVtfHklmMu+yvN51pWlmMFr/gTEJQwCMwG5nreovYQKFnufDlg/IpYNwITNMiFf3QY+ ehYem83L2HVxqnArqEWpTtjRz5SzUmF5zKcdOtQgZb67iiDB/hWmlLs2wEvhUepmNFMb cXZAzgb/8v+AWWOX66UHcTRdqE7w4c+e/y1Wx9jkonDkPPah6RBEzO1ZWIq8FPTMnuOM q8fVoCweUEzuN5SFVxfXSRFMXU0WwoB8qnoYvl90eaoInVCiT6IQK9QQ/O3gTW3jGBta VBFQ== X-Gm-Message-State: AOAM531qIB7nK2fPU/mK1QDeMDiTixehHVE0JmSl4UxXDKnJhqOaKpOL hFFY7MdKZyGZoQBVo5F85dLs1tvL/NooEg== X-Google-Smtp-Source: ABdhPJwpr4qhedCZAof5FbNy79hJrBqAZoAdxgEnGqy1kwzigsho/kbzk060hqEBoh8tl8klaH5BSA== X-Received: by 2002:a17:906:1e94:b0:6cc:4382:f12e with SMTP id e20-20020a1709061e9400b006cc4382f12emr29692520ejj.482.1651128832762; Wed, 27 Apr 2022 23:53:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/18] qemu-options: Limit the -enable-kvm option to the targets that support it Date: Thu, 28 Apr 2022 08:53:35 +0200 Message-Id: <20220428065335.189795-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220428065335.189795-1-pbonzini@redhat.com> References: <20220428065335.189795-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=2a00:1450:4864:20::632; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x632.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Cc: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651131674224100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth There is no need to present the user with -enable-kvm if there is no support for KVM on the corresponding target. Signed-off-by: Thomas Huth Message-Id: <20220427134906.348118-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- qemu-options.hx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/qemu-options.hx b/qemu-options.hx index bc196808ae..5f69b94b8e 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -4176,7 +4176,9 @@ SRST ERST =20 DEF("enable-kvm", 0, QEMU_OPTION_enable_kvm, \ - "-enable-kvm enable KVM full virtualization support\n", QEMU_ARCH_= ALL) + "-enable-kvm enable KVM full virtualization support\n", + QEMU_ARCH_ARM | QEMU_ARCH_I386 | QEMU_ARCH_MIPS | QEMU_ARCH_PPC | + QEMU_ARCH_RISCV | QEMU_ARCH_S390X) SRST ``-enable-kvm`` Enable KVM full virtualization support. This option is only --=20 2.35.1