From nobody Mon Apr 6 18:56:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773822814; cv=none; d=zohomail.com; s=zohoarc; b=TASTmdSW2EuZ0Uhozzqh9v33MgFr7l/PyZNg4fw5GjEu3AkdFcTJI8bti5zxY6GGMLjbghqkyqDrokQYhJD6awtsz6NSNXi4G4GgBSP4jy6zew/UkhSYW38c9J4TI499mpuc/3rMRY95xB1deqXtEi8gylMMhTvVUS97IMcOGJI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773822814; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=TJH5hmtoWXtvQeN49h267jukyNNYmOsCxNzFF7k3ujg=; b=WK/GzqhePPeq2fj28tQx7d1Zuo9zCCde9jY4ZbFrpUWM4ugRUMllirYIPh4i1uK042n3E5n1w4IQUqwdGQ2j9+k/V6kA9PfELgQ3Kubgn0SBMHsKoHocSuZcj9FWZ+/+Zy1a1hgg1gEOvBOiERyOg7MyQp8/ivLuGYLpHjlzOFk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773822814182969.0266917143452; Wed, 18 Mar 2026 01:33:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2mKl-0000rU-Iy; Wed, 18 Mar 2026 04:32:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKf-0000qI-Lo for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKb-0001mn-UT for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:49 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-375-FqaKp-NzNIWjJ4MCjzc0nA-1; Wed, 18 Mar 2026 04:32:43 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-4853b00f9f5so69516195e9.2 for ; Wed, 18 Mar 2026 01:32:43 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4856ec4c9f3sm114138005e9.0.2026.03.18.01.32.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 01:32:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773822765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TJH5hmtoWXtvQeN49h267jukyNNYmOsCxNzFF7k3ujg=; b=VdyWgzV6LngnsAZRsI29q7lU/xWTzO/LCf3OxUqlz55X7m78XlQXSIVLOREZQ1JXrenixT VqVkOYEP80vzObtoiZP5/KJNt2WqmIIXCcM+xN/hfQXNXZ8pwlpQa4z/gKJryoyS6lfmp1 GSmtD4MQ3/n9ut6zDRo35rt1EA0ADfs= X-MC-Unique: FqaKp-NzNIWjJ4MCjzc0nA-1 X-Mimecast-MFC-AGG-ID: FqaKp-NzNIWjJ4MCjzc0nA_1773822762 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773822762; x=1774427562; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TJH5hmtoWXtvQeN49h267jukyNNYmOsCxNzFF7k3ujg=; b=RbvnahOcq24XD4UZ7f0I3xj+UQRZukwqMCyTxW+0ZkJEuSMWnUdE9YyylMHhc9BRp5 v4douMoQOEvo7zXIpYCedQDgOTiwpVz5mnJXDBhVl/3Hee+AdNeNND5l0OGXp9j0dCG5 /DWOBzSupafCFnRnuyGXUB+72xoias95e98ClWqiXeuwqlJM3xUm+hS7MgcNk+x5iY68 aKjinn5iF4UlJT5fiascgEPJFGV7FYXnZs9r/mViMCxL4PoPKtKTS1eUgVpim1SKxPiw lFDNiQS4E7Wmfs8nWWk8LKzhbEcdPQmBoNuLbyi5jGQIg/jjbofIBBVUs5CvK8KBG67J hGpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773822762; x=1774427562; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=TJH5hmtoWXtvQeN49h267jukyNNYmOsCxNzFF7k3ujg=; b=JMlto1lBliglkLLGWTeDoY/0d8WuesCf8nr1EgZyqmP6rfhGo8JIZ87lBew44rZIbP 0Mp2xgCUU+way76T9o8a0HjNNW0dzykq2tp207GdZjE3Zapa/5PIE2Rbj2jYBMxmm4HP RnTUSuRWix16teL6x9kENpAffuzFuzgJ3pWa8tXxUOl9+kJa/TbXfpP+7GTNFAduk4Ot uD/7aYsZD4FppU9/qH0ykaMfaYtAQ143Ti/LpBTmU9Frj5z2hM4qoxgrffPAen4HuNqE CcGE7EpLLF7prO9H0aiH6XpE1+wmRK2a34F+r2TMl5+Bvrauo5bFk+ma4zzhZcEER50M Gj0Q== X-Gm-Message-State: AOJu0YzIPsRxbNI+2G+XVw4wXcAcnytWllbrGwibFHhXdzQzOzRLZ+O7 TZuCGN/+tWv+NkXri0fRqRLIupYf7jjZfDR/++jej2DVzLxxyJkj9QkIJ1DWnKv5G9EQusw8uIk Y6az09LW5ufedE452lcl30bCyFlIyhNF0gI8EzRakP7gslA0JPTWsVf4ttSxrmGov1D7//DroRy ex8yqG8IoMV++3/6gJKD/LwFfXGrijUokuRX41nBzV X-Gm-Gg: ATEYQzzTT1hW4JtSTKURkBpA0PHmG+3kUVUNzeTJoq+9A2HHKPJINNd0zB7zciXvVFX YcHe1Jn0PgZVWv4EIovrDqQ+EOxfoerrNwRzVa57B+l98HVTw6Qz9+Y6YABbfkmuIyN52bJiGjD D44eY/oGpD5pl5DVjHnoc5F7B3L6nBk8hXvLPrWJQDdlBV1/MakAi+JE1FtwlBMgHDWYZAEkbWs WFT4hz+St445BWgEihp7CK9ZzmyMgEJt0+5+V9qWs993A9wx/0EVZ8MS+i7wDGQ7MmomKT5uORN Sr/fyCRenrzSWlzap0nsRXC0GfJba+kFvoYpnhF7W6TYwLpiLuIWoc502tEuHDEHfKJoIDKRU6E BFPWgXbRt07pSmtll8T4Edtbhn4rZnjbaQJsORB0v0bndQcu/lZIYiPL7UQofd50eRn1QaHOMUU U/MjVyG+biRqPKegiblAdp5QkxYLg= X-Received: by 2002:a05:600c:3b28:b0:485:3aa1:a7f1 with SMTP id 5b1f17b1804b1-486f441bc51mr41879055e9.7.1773822761575; Wed, 18 Mar 2026 01:32:41 -0700 (PDT) X-Received: by 2002:a05:600c:3b28:b0:485:3aa1:a7f1 with SMTP id 5b1f17b1804b1-486f441bc51mr41878375e9.7.1773822761020; Wed, 18 Mar 2026 01:32:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Ani Sinha , Harsh Prateek Bora Subject: [PULL 1/4] runstate: handle return code of EOPNOTSUPP properly from rebuild_guest() Date: Wed, 18 Mar 2026 09:32:35 +0100 Message-ID: <20260318083238.1132609-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318083238.1132609-1-pbonzini@redhat.com> References: <20260318083238.1132609-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773822816659158500 Content-Type: text/plain; charset="utf-8" From: Ani Sinha If rebuild_guest() accelerator callback returns EOPNOTSUPP, this means that= the accelerator does not support rebuilding the guest state. Handle this case properly and separately from other error return codes. Fixes: 4003e5e65fe0("hw/accel: add a per-accelerator callback to change VM = accelerator handle") Reported-by: Harsh Prateek Bora Signed-off-by: Ani Sinha Link: https://lore.kernel.org/r/20260310094450.35861-2-anisinha@redhat.com Signed-off-by: Paolo Bonzini --- system/runstate.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/runstate.c b/system/runstate.c index 77cb14ae028..2d4e95a2166 100644 --- a/system/runstate.c +++ b/system/runstate.c @@ -531,10 +531,12 @@ void qemu_system_reset(ShutdownCause reason) (force_vmfd_change || !cpus_are_resettable())) { if (ac->rebuild_guest) { ret =3D ac->rebuild_guest(current_machine); - if (ret < 0) { + if (ret < 0 && ret !=3D -EOPNOTSUPP) { error_report("unable to rebuild guest: %s(%d)", strerror(-ret), ret); vm_stop(RUN_STATE_INTERNAL_ERROR); + } else if (ret =3D=3D -EOPNOTSUPP) { + error_report("accelerator does not support reset!"); } else { info_report("virtual machine state has been rebuilt with n= ew " "guest file handle."); --=20 2.53.0 From nobody Mon Apr 6 18:56:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773822784; cv=none; d=zohomail.com; s=zohoarc; b=kf4sHpn7x4dqffBz7jndBn3P+hQY0ADz3TF7niyJMnOGdt5EmYEIwQqMs32MjP3WGR+xr0GZQ2zkGDeZtt2tdvWSjoOuU1uqScEgJ3J5b2BrgBj1cOUj5IDkW1nEFsv7Gjw4taPX8S0hp+f7QlkuqU6uDNVuVElVaXj6LZ0h2x8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773822784; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=RCeY4n3aG6uvgN+2wCtWjV8E8nVdROMN1q+s0mdYmKs=; b=f9fZEfBqUKc12thOffIRfGJxXOTZHsE3yTAlopLLZ3xuf3HDpxI0Al6bpuz7rtt/gUjMwSZCla4IeN2Hh1lJ8zVrhkA1tEjJmaK4pakxtJLiVjHYotLtiC6m4gWDy8BUYEyQhEowzWesAQND9hvstiMEseyrBzsLGfGp9Cgp8Y4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773822784420526.5845607538107; Wed, 18 Mar 2026 01:33:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2mKj-0000rF-QK; Wed, 18 Mar 2026 04:32:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKf-0000qJ-Q4 for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKd-0001mt-WA for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:49 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-131-4eTIZ2ahOxOe5juTKISuCQ-1; Wed, 18 Mar 2026 04:32:45 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4853b00f9f5so69516655e9.2 for ; Wed, 18 Mar 2026 01:32:45 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486f5e162e2sm10093005e9.34.2026.03.18.01.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 01:32:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773822766; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RCeY4n3aG6uvgN+2wCtWjV8E8nVdROMN1q+s0mdYmKs=; b=ZZ5JVPxsdbj9CqU3oaPkibAZkEutB2wKEIVINbqm8+GYDW12mpGPANXK91QFR12p2ZI6Gb 7wi8GPrfHTKL8EqFKW/uG7KeBD18qdtIkg+65qL39a8WMg6OuQgPWe8qbajOwuzmcGbI1I Q/oVLyLi6ewYZERNLaptoFLbp0qXVy4= X-MC-Unique: 4eTIZ2ahOxOe5juTKISuCQ-1 X-Mimecast-MFC-AGG-ID: 4eTIZ2ahOxOe5juTKISuCQ_1773822764 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773822763; x=1774427563; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=RCeY4n3aG6uvgN+2wCtWjV8E8nVdROMN1q+s0mdYmKs=; b=pF7+S0zJidcpyAhBpeYky3aDicXauBoCkxwRM3xCd9GQilPRtIHwnXyGPCSxE+dvLf SRMfblFZSLoVdLG5ivRZp2iBoiMhTszN9mvUJL2H/cqqjjer0/5/y/2Z6kK6fJsEcQ99 Jc5k9qGD20Sg1rNIA1d/pgQVqHasZhGNdIq1w7iUBmjQCVbLc3RTbj5K06FX/duFlOyp knSCHh2LiNNs7TfJ/FGV9fF4Az8WTPEJK2IP/BObTFF+ZbyZpVB+jQEZcVCQ/mOaqPdA 7YXmcJtnvHveO6cpNRioZddbzmg+GYmmI2pf63VransHNshaZWrdsjv4T1YWMX3Lcg4i S2cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773822763; x=1774427563; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=RCeY4n3aG6uvgN+2wCtWjV8E8nVdROMN1q+s0mdYmKs=; b=TrxDrqZbhx2DIh8n5HwB23Hlz7jOT/zNAEg78wMuyMAvTXVSzH6Kskw45Zk9cNAvaO avav3m4MZX+BVsmgSS//oaj/QiZmuxmCCkJMq0P5LWr/KjGGsoe1s//LCHo/R6vshRxz CpyF4rCgrGXo8J+ATCHXNaycxz50l6fsMtXWYJZsrz1VKdhO1t442+TMeglMQJhojwtl dQqTBJ4CrsFwDbSS/362Qevd3d5+luNF8TX2SGa7xElYw5GSTxOrxvyK/O4KYzgbC4J6 h1bN9cBMErxlVRD8GFU93obSQDFQdb++JUpr4A+3I9FQjPP/37mpzyPsnDWaYDqnvzZU EPKw== X-Gm-Message-State: AOJu0YyPulUSJ80ES/p+UNYHAMkXPypDS5XCazqJnY6ytaR7t9QGxAOd a0IthT94WI4EjEmo9TKlui2KKY5zrxY4NEmFVXcWi2jO0zxu78ZUiHls0X+siLPFiIdZZx3p6JB bRBxJQbyW15ZMXi6BMoiGEkbivoMru5aJOSwyTGQaxjVgqkhivhvs5ujsPZU765IqRBKuIRGENg LaAor9RIhwFyR6NXuZ0kJrALPbi3dsxBrjF9/LP82n X-Gm-Gg: ATEYQzw2kTHSA0iQZMeSU9Kd6dY5WDThVyw7OAfSV8E31ik+845it+6aEeoCPQkU+lY DNfcK0dk6g8/qr7B9PBK6Q/IFWovfOkYJqPMC/CCGq5Z30e88YitNyAAbmeswVlzZ9fwuCvIoiG 1ovJkJ2OGyIJjYa1q18O7BNuDWG8wwk2fXojNZKyxuyxiLMytCKRmZNQCuNrmzWShDb84TsRDJL /uIu8lWKpojryDHB0LQnD8v8NJKVJdoEU4OgUmKRTQX7dvqcGV3ve5Y+rFW23gn1BCoLLYShMlT GcMyXRPdhv2ejw5zNh70q+tSBCwlWJwsPF6aTcD5VkGxKiYwBLc5UEgNHGkQK84l2j0WZHmBA/m pjKunFKApbdQ5CTLSlInNBZJZ/6G1KjGD17bw7hEVsqOBmjeRFUSYB6KUQYQovuMQ+i//keZ1VF aiFG4SLF5V7hJJkpgYwjxQiNUFhMQ= X-Received: by 2002:a05:600c:1e88:b0:485:4278:2558 with SMTP id 5b1f17b1804b1-486f441bc30mr43281335e9.6.1773822763023; Wed, 18 Mar 2026 01:32:43 -0700 (PDT) X-Received: by 2002:a05:600c:1e88:b0:485:4278:2558 with SMTP id 5b1f17b1804b1-486f441bc30mr43280935e9.6.1773822762425; Wed, 18 Mar 2026 01:32:42 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 2/4] build-sys: use the "run" variable Date: Wed, 18 Mar 2026 09:32:36 +0100 Message-ID: <20260318083238.1132609-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318083238.1132609-1-pbonzini@redhat.com> References: <20260318083238.1132609-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773822786673158500 From: Marc-Andr=C3=A9 Lureau Avoid unused variables and hand-written path, this should also help meson to figure out the relation between the commands. Signed-off-by: Marc-Andr=C3=A9 Lureau Link: https://lore.kernel.org/r/20260211103305.3112657-1-marcandre.lureau@r= edhat.com Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 11139f540b0..de00fddb2db 100644 --- a/meson.build +++ b/meson.build @@ -3504,7 +3504,7 @@ run_config =3D configuration_data({'build_dir': meson= .current_build_dir()}) run =3D configure_file(input: 'run.in', output: 'run', configuration: run_config) -run_command('chmod', 'a+x', meson.current_build_dir() / 'run', check: true) +run_command('chmod', 'a+x', run, check: true) =20 hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.py') --=20 2.53.0 From nobody Mon Apr 6 18:56:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773822819; cv=none; d=zohomail.com; s=zohoarc; b=SUlHxzj9MHexosY7ttz3Ch+Wcr2pnLW98qk4JVN04Zc4o9fHQ83eyxuHsV809e3zbBfm/mHtO/6EXCHss4kBE5EMHj8TEYNJhBnw663dkX7Z2W1PzRCU0Y5MOF2A6dWsMccjVGE9TphcLfb3rZvTLl66gMq8YdxV5xluPdCPLts= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773822819; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+yXg02PKbcxyx2q4NMqNiblXBEJD/8+Y+6AIqb2Hxys=; b=XvNIXxK5jfwLdQB46PXt1xicPr5AznLM8MXM1DgT9iqKE8KTOP/xLGgFn92HmsW8yo7Ndt0srD0MxgY0HDuP11u7O9HQHErIqTxTHPihTJSVnEiZ1rafDGHtfn5fXYAzQwmtHyCeRtPn1J3LG3ZMI+S61PD8nZ/xdRvfjziySuw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773822819050699.1978850178781; Wed, 18 Mar 2026 01:33:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2mKq-0000t2-7x; Wed, 18 Mar 2026 04:33:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKj-0000rJ-Vu for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKh-0001nb-Lm for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:53 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-562-pXjWDySCPkG3WbSMfJbjig-1; Wed, 18 Mar 2026 04:32:48 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-439c794edd9so6610780f8f.3 for ; Wed, 18 Mar 2026 01:32:48 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b51899622sm6628426f8f.28.2026.03.18.01.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 01:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773822770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+yXg02PKbcxyx2q4NMqNiblXBEJD/8+Y+6AIqb2Hxys=; b=NpKMimhF4HTn4XYKcOZ86P2cuzlStX4Y+Dvb5zfdgN2OFc2gJvlo3fhTszM3ArJ3XRTT+q K4uVAylU1LrPndlyRzK7m6+aXRmUWlpLDFEHp9qV2vt9wUA4vSq1EzzPiUnwo78Ezxyyad Jz7R0sWJGZ3pwP2yNKQQo7w9OUfl88A= X-MC-Unique: pXjWDySCPkG3WbSMfJbjig-1 X-Mimecast-MFC-AGG-ID: pXjWDySCPkG3WbSMfJbjig_1773822767 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773822766; x=1774427566; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+yXg02PKbcxyx2q4NMqNiblXBEJD/8+Y+6AIqb2Hxys=; b=mWx1+gYirY6f+yTXs0+hdlr/kEVPM3ygw80NZ6tc1Jz6IH16PKsyIUz9agnGoFVNkf o+r1rhYSenm/4HMmU3cOPhzvHjEgMOCQJNCGuLNYX//9FrUts44oKxU/SOUH7bdqHNa2 0b3Y7r9+jZtP1dDcg0Yxgb7uaUFqXjelICLTwCmN2+FJDR7duh9TNlYX3F+vrPumr/WG AWn6gJWsi8LcilYx9rosLxQa9MS1utowH2d393PHl8rIp5FYmQdgaVOXpnac/eNvax5w gYD46pImbEBrGuwXJXTGeRSK64uOWgcY5TlhELJphyu8jIyPpnscHeefmkLP2g7iGC5m 337g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773822766; x=1774427566; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=+yXg02PKbcxyx2q4NMqNiblXBEJD/8+Y+6AIqb2Hxys=; b=Cs/wBTByLuff+ZS+b/YcKDOk6v58g1dNqUvxhEhffysOua85gxz0fXWfqYH1hsGfMl EVUMO/5UgPB6RA3iPMBbuFInBIrVUU5Np/j9EVUoUWdY+Z9rRGgUWYcYF74rvudUmAC4 rRdhFn3xcsmovbzGnEbv0jZIkisiuWeyru7mxm+tZBR9rQR5rbMHEw65GN8FuwQuAo0J XH9vFeTJuN8xPBS5m3M9ch7lIVSkBmkmUd5wxEs4bWDydcDxg8JGa7W6NhlRSsm8EIML QvRJHNAhjrururSxuY0WNrXYcW/023gsTxJfSrp8mvAzXxmlseQ6dyy4tPPN5bFLv136 Nu0g== X-Gm-Message-State: AOJu0YzWVnteRKVHApHDIee95hKrKezPPLWVj212CSmqS87UhMieCxsJ BVusE+m1M3LvSgrmJTmW+eJSqcMVYe1A19q19wcKcWpPjKJW8g+EJn14iYe8+JTPZD+dvaJEORv OOGVj4o5ehL9E8Fk9HCLXkdvsVmgvwqt7pQsDVT8AerYiKIRw5BKsQy+ylbTccg15M43lql/Pra Ixe91Kybvc5UfgyLGOqFgbf8IZH5y8CxKbDoMYRhvx X-Gm-Gg: ATEYQzxtEXGr5H78akhmzTUVg0nkAhIz5Tei+OJMtNrrcKsxPNJIIPkCTXiZ5etol6d 0CRvl0Ib9trwoxixhPfZRJ91og4W+mpW2jo7XTV3tUY7DW+nIis1B1mnsw2AGLNNY4LRPK49pHu phGY/fBt4ssCoDW08EkXV2CruVyG/yf4Xj4PcJpmSx+moIiFGZw/FxMP2cA741yvEJs4WIs8Hxe if6cmhfru0obefV1KUwOnhKsS6NH3YYP1vlQDxFsHhuCKwrxpskoFt3BHXgtOboSc4hWIjAQ9uW 2DgP8zbNiHgB6jmS3/y9GtpDB9dM/nkTNWj3cLIhxuL0SBwhcyHVPjFmeZXcwvxZ3qIggGXMhx9 N1IDu7S/qzO4Ro/ctU079tal9r94Kmw5kCuJQ+D6VnJOlK2eqiRY+RLPgHNk21EBfIOXwGJc/Sv oiBBykYGbsO3ap2qkDyZOVfJMg4jY= X-Received: by 2002:a5d:5f43:0:b0:439:b7c9:2ef1 with SMTP id ffacd0b85a97d-43b527a979bmr3841777f8f.20.1773822766217; Wed, 18 Mar 2026 01:32:46 -0700 (PDT) X-Received: by 2002:a5d:5f43:0:b0:439:b7c9:2ef1 with SMTP id ffacd0b85a97d-43b527a979bmr3841722f8f.20.1773822765676; Wed, 18 Mar 2026 01:32:45 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 3/4] rust: fix build when --disable-rust and meson < 1.9 Date: Wed, 18 Mar 2026 09:32:37 +0100 Message-ID: <20260318083238.1132609-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318083238.1132609-1-pbonzini@redhat.com> References: <20260318083238.1132609-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773822820995158500 Commit e65030ed50ee moved rust_std and build.rust_std from per-target override_options into the project's default_options, in order to avoid repetition. However, default_options are validated unconditionally at project initialization, even when Rust is disabled. This breaks builds with meson < 1.9.0 which does not know about "build.rust_std": meson.build:1:0: ERROR: Unknown option: "build.rust_std". Make the options conditional on the meson version, since Rust only supports new versions of Meson anyway. Fixes: e65030ed50ee ("rust: remove unnecessary repetitive options") Reported-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index de00fddb2db..d016482db1b 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,11 @@ project('qemu', ['c'], meson_version: '>=3D1.5.0', default_options: ['warning_level=3D1', 'c_std=3Dgnu11', 'cpp_std= =3Dgnu++23', 'b_colorout=3Dauto', - 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue', - 'rust_std=3D2021', 'build.rust_std=3D2021'], + 'b_staticpic=3Dfalse', 'stdsplit=3Dfalse', 'opti= mization=3D2', 'b_pie=3Dtrue'] + + + # build.rust_std breaks with older meson, but Ru= st does not + # support old meson anyway + (meson.version().version_compare('>=3D 1.9') ? [= 'rust_std=3D2021', 'build.rust_std=3D2021'] : []), + version: files('VERSION')) =20 add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: = true, --=20 2.53.0 From nobody Mon Apr 6 18:56:45 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1773822833; cv=none; d=zohomail.com; s=zohoarc; b=kP2XQqJ8z7u5O5Yyj1XPlZ4JwU7ACqDa3t494Q9KMFub/OsS+t5HwW0ViBCtpTP4oeygk8hgLhdjrXqIMayxqIM+6AHtTTwljcf06sn8XdVwQCS2O4FSw/e4ZkQ7N9SHaafwBFaYfFSlZqMoIlKEgXpUBTq+vfY/l+/K9g2cmEk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1773822833; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wIJ7DrPgVmjwpgfX5YS474vIHpoL5e37oQePzDSoBEo=; b=EW4REpVPlYon/zUn2KSp+vvOcCxWLYlpqMD1r7dG3qJyYJGjNrWJd4MnjIFLtqjW0QDH/bGZLe+hn8143YjeX8Hgx9iZjdp3Df27yV+err4aknwk0fxr/Y6h3xS8DyXBOH21cPWIvHQxjJH9QPP1sauO3Lq0gQ9dpNlNzkvBDY4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1773822833391976.7172108084826; Wed, 18 Mar 2026 01:33:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w2mKq-0000t8-MT; Wed, 18 Mar 2026 04:33:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKo-0000s8-Af for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w2mKl-0001nx-Hx for qemu-devel@nongnu.org; Wed, 18 Mar 2026 04:32:57 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-60-jsaMgZ63OBuLrDC7dn2Q0w-1; Wed, 18 Mar 2026 04:32:51 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-485c45885e6so3402545e9.0 for ; Wed, 18 Mar 2026 01:32:51 -0700 (PDT) Received: from [192.168.10.48] ([151.95.144.138]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-486f4e5495csm21231305e9.2.2026.03.18.01.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 01:32:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1773822772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wIJ7DrPgVmjwpgfX5YS474vIHpoL5e37oQePzDSoBEo=; b=fAfDReLvhcGBW7hx69bRZqWGie+gb2lGgvEDLPX/+YhiVGkGx18zgU5Q5L9+1iuHeBy5Ma 15aEqXpKHlL+yUtQBHi7cd086eAUc52B2IP04+lNQOzMoYatSCDlx2SrCpzxZGAM1GqXey GTegS6O5GT6UBMxonS854M9xoNHvasg= X-MC-Unique: jsaMgZ63OBuLrDC7dn2Q0w-1 X-Mimecast-MFC-AGG-ID: jsaMgZ63OBuLrDC7dn2Q0w_1773822769 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1773822768; x=1774427568; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wIJ7DrPgVmjwpgfX5YS474vIHpoL5e37oQePzDSoBEo=; b=EiVVyuK3hsHyDA470aYWW9RhrP8UjbS7NvH991yXuTMJd3/aVtWDugeI8YQ8U78i0g 21ZDMP1gLEHTuXUAjRSLtLaEXzEqgtZ7oGmS/WCuA5j9gY7EhKaiOygV7oiO530Owss8 gsvP55nW5vk/cPw3Y9Nqvb5gNHCOf/kKsjml1RoHbpGj/GdpfuN3nxMwSJZdZqI1nAAV 3jcH9VURPHaS9rmkhKnuA/YO97jU0p9JXfPlZJYmqc3yeQeUZ9pWdQp8Iqp9NA6TgJuZ 7beQCdyFJyEzH/f0DIsXp10OGxFdDxw1m1Gi4sj7GXeoTYuR5Qo1iQlTgRAmREXa65HW aqjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773822768; x=1774427568; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=wIJ7DrPgVmjwpgfX5YS474vIHpoL5e37oQePzDSoBEo=; b=rxKvxNWUi+Zor5KElz8SSKxPDJDSv9sa72drkqV2LehkdrO8YaU+HNM3FbWifZYOgf dD7ymgGzmgHLtUbB7whZInJIVY2oxMoZzzhSTr+5Z3PVgpIHCWtvVRevjbG2m8+iJHdU IpXIrhEEwm9mOggXy88CKWWwyXgj1FpRQ7LU1B79LvBBskwnhEQQmIxAlptDOUhx8Kpj KOGKIm+ISCNKfHowVJUwqleQySNs3WA1OyPZ7qea/RVbTALg4WAAxD8w/zgsCIIOjsfP epRv7XXVUt3fB2I3ZbLE74F42Jgon5qYIj5Kf2NWEkkgFEfoocC056GmtPAUvPAwHJFx X3Vw== X-Gm-Message-State: AOJu0YwYKLBfKbXPXHtg0zb8rtiunDO3PZag7qgAUcRLegCpHEOqZDL3 CImwnAO3rGuzdEfKDIpdmOM15LvGMFF7a+C4vfTUlf7u05LMjYYISs1j7PNPDt2Mc+/VvN+ilRB UOsCnyZAdc+R/YSgavFT1jTG2RxjZEBacwXw5/VAY5GKA6FC8b/IoResaUKl7J4/j+BsLaaNOsG KUnQnkX+tMshs4ZuXID35JFIsTe7D9LzYj42MjJN7L X-Gm-Gg: ATEYQzxM7S92OUJ/c1yzrNjzLM6NxOufZn2tVRkfrHuReVwCuswxm41TUynX5UThypE u6r7mXZL89R7LUdvqvrAA+sq3ycg439S9Wqf7eAin7yqWpdEvlIfkr0lagD+jyPLjBHcAwum+9w +k+UrIb4YAm96eIylUH5sXJmPqBvWXqQ/7lrIcQGADskLGm2cNcWSuKhqPHfxE0ch1D+trBL606 AZK41eQgLTC77LYs2PvuriYcMPx5blobY2D87tHDXYIy3aoS93D0PLWaXkHNSq1mMaRWwBBHPQV iZT9tf3YBoSs3fQfy5g9smK107n+YsQSbiJqTggXpAYO3Kzpuv6Ks5Fim3gomR8XgGEsydQPAYF xZDg9pOR61VJqPYOHOk3NeLi8zGqDD6CkywTHpGPUNBiSzoTw1hoTaX5J7fGBZBpD57BVeTFhkP LBs3+rGYPV4zxRLc+YMknkIm9QEeY= X-Received: by 2002:a05:600c:8b52:b0:483:8062:b2f with SMTP id 5b1f17b1804b1-486f4421c57mr37873955e9.6.1773822767528; Wed, 18 Mar 2026 01:32:47 -0700 (PDT) X-Received: by 2002:a05:600c:8b52:b0:483:8062:b2f with SMTP id 5b1f17b1804b1-486f4421c57mr37873425e9.6.1773822766945; Wed, 18 Mar 2026 01:32:46 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Peter Maydell Subject: [PULL 4/4] rust: suggest passing --locked to "cargo install" Date: Wed, 18 Mar 2026 09:32:38 +0100 Message-ID: <20260318083238.1132609-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260318083238.1132609-1-pbonzini@redhat.com> References: <20260318083238.1132609-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.819, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.903, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1773822834535154100 Without the option, cargo will try using the latest version of the dependencies of bindgen-cli. While it will obviously respect the constraints in Cargo.toml, old versions of Cargo do not have version-constrained resolution and will choke on dependencies that need Rust 2024. Cc: Daniel P. Berrang=C3=A9 Cc: Peter Maydell Signed-off-by: Paolo Bonzini --- docs/about/build-platforms.rst | 2 +- meson.build | 2 +- tests/docker/dockerfiles/fedora-rust-nightly.docker | 2 +- tests/docker/dockerfiles/ubuntu2204.docker | 2 +- tests/lcitool/refresh | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/about/build-platforms.rst b/docs/about/build-platforms.rst index 6e3088d524a..3d23dfbd779 100644 --- a/docs/about/build-platforms.rst +++ b/docs/about/build-platforms.rst @@ -114,7 +114,7 @@ Rust build dependencies bindgen tool, which is too big to package and distribute. The minimum supported version of bindgen is 0.60.x. For distributions that do not include bindgen or have an older version, it is recommended to install - a newer version using ``cargo install bindgen-cli``. + a newer version using ``cargo install --locked bindgen-cli``. =20 QEMU requires Rust 1.83.0. This is available on all supported platforms except for the ``mips64el`` architecture on Debian bookworm. For all ot= her diff --git a/meson.build b/meson.build index d016482db1b..62fab727f4e 100644 --- a/meson.build +++ b/meson.build @@ -114,7 +114,7 @@ if have_rust bindgen =3D find_program('bindgen', required: get_option('rust')) if not bindgen.found() or bindgen.version().version_compare('<0.60.0') if get_option('rust').enabled() - error('bindgen version ' + bindgen.version() + ' is unsupported. You= can install a new version with "cargo install bindgen-cli"') + error('bindgen version ' + bindgen.version() + ' is unsupported. You= can install a new version with "cargo install --locked bindgen-cli"') else if bindgen.found() warning('bindgen version ' + bindgen.version() + ' is unsupported,= disabling Rust compilation.') diff --git a/tests/docker/dockerfiles/fedora-rust-nightly.docker b/tests/do= cker/dockerfiles/fedora-rust-nightly.docker index 043b42a0a9b..38381ef8f59 100644 --- a/tests/docker/dockerfiles/fedora-rust-nightly.docker +++ b/tests/docker/dockerfiles/fedora-rust-nightly.docker @@ -179,7 +179,7 @@ RUN set -eux && \ test "$RUSTDOC" =3D "$(/usr/local/cargo/bin/rustup +nightly which rustdo= c)" && \ test "$RUSTC" =3D "$(/usr/local/cargo/bin/rustup +nightly which rustc)" ENV PATH=3D$CARGO_HOME/bin:$PATH -RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli +RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bindgen= -cli RUN $CARGO --list # As a final step configure the user (if env is defined) ARG USER diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index 23b33d6ad44..44e763f571a 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -162,7 +162,7 @@ ENV CARGO_HOME=3D/usr/local/cargo ENV PATH=3D$CARGO_HOME/bin:$PATH RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \ apt install -y --no-install-recommends cargo -RUN cargo install bindgen-cli +RUN cargo install --locked bindgen-cli # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 259e6ea0729..79a280feab4 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -147,7 +147,7 @@ fedora_rustup_nightly_extras =3D [ ' test "$RUSTDOC" =3D "$(/usr/local/cargo/bin/rustup +nightly which r= ustdoc)" && \\\n', ' test "$RUSTC" =3D "$(/usr/local/cargo/bin/rustup +nightly which rus= tc)"\n', 'ENV PATH=3D$CARGO_HOME/bin:$PATH\n', - 'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli= \n', + 'RUN /usr/local/cargo/bin/rustup run nightly cargo install --locked bi= ndgen-cli\n', 'RUN $CARGO --list\n', ] =20 @@ -158,7 +158,7 @@ ubuntu2204_rust_extras =3D [ 'ENV PATH=3D$CARGO_HOME/bin:$PATH\n', "RUN DEBIAN_FRONTEND=3Dnoninteractive eatmydata \\\n", " apt install -y --no-install-recommends cargo\n", - 'RUN cargo install bindgen-cli\n', + 'RUN cargo install --locked bindgen-cli\n', ] =20 debian_all_test_cross_compilers =3D [ --=20 2.53.0