From nobody Sat Nov 15 14:11:20 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1750662874; cv=none; d=zohomail.com; s=zohoarc; b=I845Q0IlL7riV0mknaoXBYAlkCAQ8u4yHOozre7TY2ZqnsCzlDa5RjwC/O5Uh6fQWYzsbIPBOldxMiQuznYdzoqDxmz7mAqQ2FiVM0s3sokE9gG1Mehcf6Rr41aYfuVLHNgpgtR90otWQQKKjsVHuZNK71uNv6ESr05G2JPKET4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750662874; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=6TuJgHx6HLDxg+XieCyKslnGeMp4OYgT/lICNZqab/Y=; b=TYRcUISYA9Gf5E2cyEE9TklPjqqYaSIW2GEXU+VxBYsxB5cfBKjXdzyGRZ7+P+nXIc9pHaT0XGBJW4CU/c8Qity99mi1hkby5q+jcXkPAwAMVBqB5Km+k3RAvUvr4IZbQdA3TZcXHoRM3XaMdIT3o0rJFCLq6eOm9kTCtpvLVVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1750662874316582.0460086724755; Mon, 23 Jun 2025 00:14:34 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uTbN6-0003Dp-0q; Mon, 23 Jun 2025 03:13:40 -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 1uTbMz-0003CP-Qn; Mon, 23 Jun 2025 03:13:35 -0400 Received: from mgamail.intel.com ([198.175.65.15]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uTbMu-0006X4-Qh; Mon, 23 Jun 2025 03:13:33 -0400 Received: from fmviesa005.fm.intel.com ([10.60.135.145]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2025 00:13:24 -0700 Received: from liuzhao-optiplex-7080.sh.intel.com ([10.239.160.39]) by fmviesa005.fm.intel.com with ESMTP; 23 Jun 2025 00:13:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1750662809; x=1782198809; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=qOl7mHK6TK3aNhs6+gjydbgxV9RfzDGdv3wDQBk3UDE=; b=NC+KQ8EMkCIFWwdLkNnzjyOfXvySZagea9qVdGpq9X46mwho3wohly5f EZYqsBWQ+C/xdiQ9b36PmqMMVPaSjsqorr0sYmg2/if9gRT8M0idrqUri KLQEta733/dX2vktgqfIzgenOmzrcXpT2SfwxMTYEp/1lQKn/Cv9O37++ 92V68BQeQ7We3D3+ji2yUQGrC+2nmkcIRATbCG3RJLwwAxL/EYEfhkjpM 0UlSo2ir2jMgMQfyupZZpqtHkIviLqmHoEUw2GPCuN+047t4fa6eMslg6 BNrjnnZze6GX4PJPObOYfwToQV69UONG0t3Vj/ohqvBM0wGLcibss4ggv A==; X-CSE-ConnectionGUID: OmIrM+W2TTerNc28nIIrpg== X-CSE-MsgGUID: KX5II8ApR9mdSGFjF0A63g== X-IronPort-AV: E=McAfee;i="6800,10657,11472"; a="56526768" X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="56526768" X-CSE-ConnectionGUID: PCMeYeJwRDSaVYiADSry+g== X-CSE-MsgGUID: 3Oue4hlDSCSybtk4n698SQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.16,258,1744095600"; d="scan'208";a="155819621" From: Zhao Liu To: Paolo Bonzini Cc: qemu-devel@nongnu.org, qemu-rust@nongnu.org, Dapeng Mi , Zhao Liu Subject: [PATCH] rust/qemu-api: Fix binding path in source directory Date: Mon, 23 Jun 2025 15:34:36 +0800 Message-Id: <20250623073436.1833357-1-zhao1.liu@intel.com> X-Mailer: git-send-email 2.34.1 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=198.175.65.15; envelope-from=zhao1.liu@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.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_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1750662875748116600 Content-Type: text/plain; charset="utf-8" The build.rs had supported placing bindings.inc.rs in rust/qemu-api/src, but this "not encouraged" feature is broken. Considering that manually copying bindings.inc.rs to the development directory is also useful, fix the bindings.inc.rs path generation to give this feature another chance. Fixes: commit 1ae4ca0463d7 ("rust: move rust.bindgen to qemu-api crate") Signed-off-by: Zhao Liu --- rust/qemu-api/build.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/rust/qemu-api/build.rs b/rust/qemu-api/build.rs index 7849486c1baf..29d09456257c 100644 --- a/rust/qemu-api/build.rs +++ b/rust/qemu-api/build.rs @@ -9,12 +9,14 @@ use std::{env, fs::remove_file, io::Result, path::Path}; =20 fn main() -> Result<()> { - // Placing bindings.inc.rs in the source directory is supported - // but not documented or encouraged. - let path =3D env::var("MESON_BUILD_ROOT") - .unwrap_or_else(|_| format!("{}/src", env!("CARGO_MANIFEST_DIR"))); + let file =3D if let Ok(root) =3D env::var("MESON_BUILD_ROOT") { + format!("{root}/rust/qemu-api/bindings.inc.rs") + } else { + // Placing bindings.inc.rs in the source directory is supported + // but not documented or encouraged. + format!("{}/src/bindings.inc.rs", env!("CARGO_MANIFEST_DIR")) + }; =20 - let file =3D format!("{path}/rust/qemu-api/bindings.inc.rs"); let file =3D Path::new(&file); if !Path::new(&file).exists() { panic!(concat!( --=20 2.34.1