From nobody Thu Jan 8 12:32:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1766055564; cv=none; d=zohomail.com; s=zohoarc; b=B8P5IZKnrhmHpyADvByah0VWC589khfkA8NcV0CXS/v3O4K3eucmeyW9C3GMJtU6zQVWGBf2dH5vSjNRf9lEnWOckLvFqE48Xpyt9CFVOKyOB2e4kavvWzbrf7/abKP4YQbrv/c9ZlVwwQ0YbNuSpP6Bevjk/LPRFO5VfnkoCT8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766055564; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+MS8oG8pUBLpaQoG+yzL4UbkTWEGCYSjvyGDww1VIsA=; b=gTM/PF5kH1r8nFZg9JGZdwuwJt0WgLNgtei4rLqp8/69OfrQsd+JROhs8BprBTRDLncAxlYGMfiBKtngxk2kblFIU10Gri1hH7wxpinL3E85VVXnT8aXb4utfdP/Uo1zeVUwHqRFoE40EoRaCOHf6pUXGXckXHk7kMq/gdhO4zM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1766055564613120.3264391803483; Thu, 18 Dec 2025 02:59:24 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1189435.1510175 (Exim 4.92) (envelope-from ) id 1vWBiu-00084d-0o; Thu, 18 Dec 2025 10:59:08 +0000 Received: by outflank-mailman (output) from mailman id 1189435.1510175; Thu, 18 Dec 2025 10:59:07 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vWBit-00084W-Tg; Thu, 18 Dec 2025 10:59:07 +0000 Received: by outflank-mailman (input) for mailman id 1189435; Thu, 18 Dec 2025 10:59:06 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vWBis-00082Q-UR for xen-devel@lists.xenproject.org; Thu, 18 Dec 2025 10:59:06 +0000 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [2a00:1450:4864:20::335]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 91940e2b-dc00-11f0-9cce-f158ae23cfc8; Thu, 18 Dec 2025 11:59:05 +0100 (CET) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-4775895d69cso1940935e9.0 for ; Thu, 18 Dec 2025 02:59:05 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-432449986f1sm4350918f8f.29.2025.12.18.02.59.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Dec 2025 02:59:04 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 91940e2b-dc00-11f0-9cce-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1766055544; x=1766660344; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=+MS8oG8pUBLpaQoG+yzL4UbkTWEGCYSjvyGDww1VIsA=; b=H7fZCybPn648sBOBnWORSjzeOJ8xTmI8pXLPixCiNBoQwl0t87dfTObBp3+K2j+WAA 8XDljxH3Y5iRmOHmNBFmcCHagYuf12//SnZzCRt8fvE5mb5C2LiWTacn5QWOWEn+VbBF PzPLsskSANRGUTdQqiKG89S15BdaIPmOc2XWIHVIu9Qvl/bzGB4lDxugci1QRMdXw0YM N8svTe6sPdpiSBjcmebEe+U1qxYEKRnI/Jb3/cdvD4y+BR5ztqjEuLmc1WnhgpZEpqzl 5/DgMtRkbcbxRuKrNswZ/3X1Mz6ztGxrNaJqX7Xs911jzKcz1exNoEduhYSLo7feMUfv dqXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766055544; x=1766660344; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=+MS8oG8pUBLpaQoG+yzL4UbkTWEGCYSjvyGDww1VIsA=; b=tijNxmTRgwQ5guSiNr2pQ7DQT/0T5T6dXV7uR7QgtoFcY/P0uFypnQpAJauCUxTqNl GPda+HHRfXpKlr8cPtHo4WVPhKESm81j7Bp8HWeIjmK9xNyGfas+OmgffBEreN1pqRVU MpBm/QqnNQ1nVtl4KXfepszia7wTNu7yjnRrOoDSjHbXpy+2YV/fiRwTeEio2ZiBKEP0 n14wylVCQKWwFjMFAPdKrZG5ZoSMc8UXwlOubiOB4ksp0XfKXIh71lFGFzWOpB+Nvvej GXwyivxJS+8MlTfcs+VA5N6+M5KoL+gO45hghFkzNO/+5K7nTdrgrrbtHaTrJjDRxJZ7 Ea6A== X-Gm-Message-State: AOJu0Yxyu0/pKk+kHdz40/FiH5jrVhuF3zqbnERgTnZju2GUC/PrTH2l /z2m4V7gtL1CfJx3QiAbVZPJx+6baQ0+ktAIXESSuqav+iLfRPPfgRDblAKqPxNBPsKaFs6ZT0m +lEc= X-Gm-Gg: AY/fxX6EIMXgqXlmz5p0CGfWgq3gbVHZdJHr2QEcrmfat5jlvAAv4E5/RzJMeXkk+kO 3tNCGWsYAYvK/aQ0VFWfQSfMV09DhG+WgjL7s11K5HSIO51lrTfCxMvKJtkijfVCE3vaRdV97ad HLI4g3WRpAoTsY18WDsDvNA2hXWq5dRPiwQfxCMywWV92psw3Zi0ftJ3+MlZs19ZE/RmXQqEvaN Jlh+LMr8RzRHhR683+Tbmp0ROzxxwMBSB/IzFbyC9ZXOLoiHipsI7ABlRqXsJ8B+McJCgT44WSI XZm06iIql0tV7fujUJpgve5wrgE1oXK65F61SMukWbgQ1bnMOLT3aXWLQ3+8+Fj2cTbT3qZUHSx OaSQbtQusBd3yIia6MUNCcDN10BopgfDaKzBJe5idI2W4hZP7oqETRt5J3CJOMG6CVHg0fxbChj JJh7tU83kiYVxWQ5xZBDPH4uPbYPvkC9aZXop9YdQFxOMfJW+YCJQmZApaxNX0kCS6+yyUBfr0r jU= X-Google-Smtp-Source: AGHT+IG1h6YzQpn4T2sYw3fL09qnnlD5LpknoNKEUFYFPlCwJ8RqugGeTysENlgInzV8mrgLwQl3jA== X-Received: by 2002:a05:600c:3f08:b0:477:abea:9028 with SMTP id 5b1f17b1804b1-47bdd99c3c4mr50599395e9.6.1766055544459; Thu, 18 Dec 2025 02:59:04 -0800 (PST) Message-ID: <7582d5d2-bb9b-45ee-8d79-b10cf00eeeef@suse.com> Date: Thu, 18 Dec 2025 11:59:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/2] x86emul/test: use vpath uniformly for access to code living elsewhere From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Anthony PERARD References: <4c2a53b1-7133-4900-8bc8-26fc97aa1702@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <4c2a53b1-7133-4900-8bc8-26fc97aa1702@suse.com> Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1766055566866154100 Content-Type: text/plain; charset="utf-8" Replace the remaining non-local symlink-ing (i.e. of core emulator files) as well, to avoid mixing approaches. (The symlink-ing of test blob sources needs to remain for the time being.) Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- Unlike in the subsequent fuzzer harness patch explicit dependencies can't go away here, yet. $(DEPS_INCLUDE) would need making use of first. --- a/tools/tests/x86_emulator/Makefile +++ b/tools/tests/x86_emulator/Makefile @@ -11,6 +11,11 @@ all: run: $(TARGET) ./$(TARGET) =20 +# Add the core emulator to the build +vpath x86_emulate/%.c $(XEN_ROOT)/xen/arch/x86 +vpath x86_emulate/%.h $(XEN_ROOT)/xen/arch/x86 +HOSTCFLAGS +=3D -iquote $(XEN_ROOT)/xen/arch/x86 + # Add libx86 to the build vpath %.c $(XEN_ROOT)/xen/lib/x86 =20 @@ -287,12 +292,8 @@ else run32 clean32: %32: % endif =20 -.PHONY: x86_emulate x86_emulate: mkdir -p $@ - ln -sf $(XEN_ROOT)/xen/arch/x86/$@/*.[ch] $@/ - -x86_emulate/%: x86_emulate ; =20 HOSTCFLAGS-x86_64 :=3D -fno-PIE $(call cc-option-add,HOSTCFLAGS-x86_64,HOSTCC,-no-pie) @@ -307,6 +308,8 @@ x86_emulate.h :=3D x86-emulate.h x86_emula $(OBJS): %.o: %.c $(x86_emulate.h) $(HOSTCC) $(HOSTCFLAGS) -c -g -o $@ $< =20 +$(filter x86_emulate/%.o,$(OBJS)): x86_emulate + x86-emulate.o: x86_emulate/x86_emulate.c x86-emulate.o x86_emulate/%.o: HOSTCFLAGS +=3D -D__XEN_TOOLS__ From nobody Thu Jan 8 12:32:49 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1766055579; cv=none; d=zohomail.com; s=zohoarc; b=lome0unWm0oEL1VS7Eq4szpti9+VNrQRIS1yHoXpBvm4kLZPx3baQkI7+mLW3PaLpTKfAhzbErKz2bl5U7N4fv8HchOEXMolZfZj3b8reAC6MvJ+35xob4nGOBGKhgTaVB08S7cFqHlDxg4/8R+iSIBZuXeebi5BZXpoB0s9DkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766055579; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=BXy80KxmNAHr1VNz3GxIhKBmxQj+zVGkXXH4ZO7kVPc=; b=eUfjXNgLT4vPHpk827S+cgPpTJXqYNtwpNvU5g0gGGCw0PhRpwIcuuOzKs+ZDD4+5xKRND+wXnHMtLRAbHwnNYjT80Ot+jjaqNsf0J4hye1FUROlKsd01aRWJkbyXmPoDYxRFvsypGFNPElmElwGHl0RCF+aXmnmSSmo2+16W10= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1766055579165383.8152848899524; Thu, 18 Dec 2025 02:59:39 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1189437.1510184 (Exim 4.92) (envelope-from ) id 1vWBjC-0008Oe-7D; Thu, 18 Dec 2025 10:59:26 +0000 Received: by outflank-mailman (output) from mailman id 1189437.1510184; Thu, 18 Dec 2025 10:59:26 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vWBjC-0008OX-4a; Thu, 18 Dec 2025 10:59:26 +0000 Received: by outflank-mailman (input) for mailman id 1189437; Thu, 18 Dec 2025 10:59:25 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vWBjB-0008OJ-AZ for xen-devel@lists.xenproject.org; Thu, 18 Dec 2025 10:59:25 +0000 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [2a00:1450:4864:20::336]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 9caabaac-dc00-11f0-b15b-2bf370ae4941; Thu, 18 Dec 2025 11:59:23 +0100 (CET) Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-47774d3536dso4131015e9.0 for ; Thu, 18 Dec 2025 02:59:23 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4324498f95asm4420281f8f.22.2025.12.18.02.59.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Dec 2025 02:59:23 -0800 (PST) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 9caabaac-dc00-11f0-b15b-2bf370ae4941 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1766055563; x=1766660363; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=BXy80KxmNAHr1VNz3GxIhKBmxQj+zVGkXXH4ZO7kVPc=; b=YWRQ0eRylZ5hJTX7BaBTxsJgMJ39NwDy/gSUZFNqbMXDOjCqL+36mbDEKXXBYOIzVB L0PcOvJYNlYqBUtU8yqOViSFepZbMqQOnM+DeuME5DnLdYpHEicrOWgBNRT6AYIZ3Oeo pj8cIoRS+rcaPVTYZC/mR2X70AckdT82t+gRtE+nHtXNh705bhNLZVscpbFeji2J+z8p 3K2PSwCr4SD0koLY0RTGDdn1qRLxw8ymwU3edr3sDtaiF8MJMGX4Ty8VSHy+X1xEJAZz YmE6+4qWqdxz+J7ZVPWdo1ClsAfcnWgPIh+rwMSZlkuawzQ/FWZoTZg5JhWmC+NoOWJN pvVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766055563; x=1766660363; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=BXy80KxmNAHr1VNz3GxIhKBmxQj+zVGkXXH4ZO7kVPc=; b=dt21IpdUAmog2ReJjWY1ZC/ityyGnFiIF+n62YfpTJrSh032weWJ3pu2J4p2gQCxgp Q52PnHLqKicDJRMJ+QSCGuCK70YhwRIwgHku6reNce0trjS7xRaZgheDIs6nZUf/vOz1 hygkXfYy4CBeyZGhUwDTCG+mABBoVp8x2mRl1DKr3+qrt43VvJbGX0a76yY6Vd81tT2u tNNDz5ew4eqPk4MEn7YoaIY9Oou8qVe1Uj0Ft4aECiMP2VSPD9mJX2ib8CNxq5/sLQPp JC74SKrLrDbRhupAGgAnYPxBSU8RIVz4u8sRvPzQkKWej0ab09MsFvzBDs7b567znGnV II1A== X-Gm-Message-State: AOJu0YwOMRB0Co67lgP6lA6y32CWFbE8ma0zVcAqwBzZqiih5fg2d+rA ix9qEs/dbymXw1UviotuCOFZAR9ean9TICK6uG/8rhf4FiwrcLxzA7HmIoDD1avepZFrkwI0HZk u8rI= X-Gm-Gg: AY/fxX6E8GtBzAhJR8ukwP9zJ1OeBCFjQJBtZU1iy1QZn5dAauKF8lWOgFbUkHzZGz2 ayeS3u7X/QW9fTKOjW6Jb3mp6NmDy0ey7lHE6o7mTzMsVC8VXPqLLqO4FPlZPFKdwHnI+X8KVjj CK4p7Bqhbit4frX0OOhk8Y4JqjWdGT40yCrvdrFgh/a5QmmnFHphleyfvG5snUJ4Z2OMDc8qFTO juTfbyyAhaA+0T+/LSWiJR7dSCkIGGWOpb3mat6KSZHexsNXn1KRLfpGgcMW1XZmGXZcNu8eDBd JXCANU561yRF1hpqbUyVKsGm7q/1Y8Sj6gvS6MPsBZADL0IiqiRDtI5VghdhgZYZK7a+BrVPgdg G+6CsV1esrRjiVtYATxMebbfGU6G0zpziqP68nxc1zja3Lw+CZzP1BwuJo8D3dokq/Q185q9rFL 8ZlPxSl1O3GaCAqruRgp3brMItepzX+trZrIoxnKfjs9EN5Mf0b10Z3VAepy8Z3JfGDLuivUh1s NI= X-Google-Smtp-Source: AGHT+IFiwc/EwUNKeDcHhfdE1D1x7NjkF8HgnuN9lp1ZfYQq3ua5MCenvqxGmoBFkQbCcvhrjhpRpA== X-Received: by 2002:a05:600c:4e42:b0:477:a219:cdc3 with SMTP id 5b1f17b1804b1-47be29d7cf4mr22421255e9.12.1766055563196; Thu, 18 Dec 2025 02:59:23 -0800 (PST) Message-ID: <5704d0a6-4428-4930-81a4-5f9504168011@suse.com> Date: Thu, 18 Dec 2025 11:59:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/2] x86emul/fuzz: use vpath uniformly for access to code living elsewhere From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Anthony PERARD References: <4c2a53b1-7133-4900-8bc8-26fc97aa1702@suse.com> Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: <4c2a53b1-7133-4900-8bc8-26fc97aa1702@suse.com> Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1766055580525158500 Content-Type: text/plain; charset="utf-8" Replace the remaining symlink-ing (of test harness and core emulator files) as well, to avoid mixing approaches. This way various explicit dependencies can also go away. Signed-off-by: Jan Beulich Acked-by: Andrew Cooper --- a/tools/fuzz/x86_instruction_emulator/Makefile +++ b/tools/fuzz/x86_instruction_emulator/Makefile @@ -8,22 +8,23 @@ else x86-insn-fuzz-all: endif =20 +CFLAGS +=3D $(CFLAGS_xeninclude) -D__XEN_TOOLS__ + +# Add the core emulator to the build +vpath x86_emulate/%.c $(XEN_ROOT)/xen/arch/x86 +vpath x86_emulate/%.h $(XEN_ROOT)/xen/arch/x86 +CFLAGS +=3D -iquote $(XEN_ROOT)/xen/arch/x86 + +# Add the emulator test harness to the build +vpath %.c ../../tests/x86_emulator +vpath %.h ../../tests/x86_emulator +CFLAGS +=3D -iquote ../../tests/x86_emulator + # Add libx86 to the build vpath %.c $(XEN_ROOT)/xen/lib/x86 =20 -x86_emulate: FORCE +x86_emulate: mkdir -p $@ - ln -sf $(XEN_ROOT)/xen/arch/x86/$@/*.[ch] $@/ - -x86_emulate/%.c: x86_emulate ; -x86_emulate/%.h: x86_emulate ; - -%.c: $(XEN_ROOT)/tools/tests/x86_emulator/%.c FORCE - ln -nsf $< $@ -%.h: $(XEN_ROOT)/tools/tests/x86_emulator/%.h FORCE - ln -nsf $< $@ - -CFLAGS +=3D $(CFLAGS_xeninclude) -D__XEN_TOOLS__ -iquote . =20 GCOV_FLAGS :=3D --coverage %-cov.o: %.c @@ -33,18 +34,13 @@ OBJS :=3D fuzz-emul.o x86-emulate.o OBJS +=3D x86_emulate/0f01.o x86_emulate/0fae.o x86_emulate/0fc7.o OBJS +=3D x86_emulate/decode.o x86_emulate/fpu.o =20 -WRAPPED =3D $(shell sed -n 's,^ *WRAP(\([[:alnum:]_]*\));,\1,p' x86-emulat= e.h) - -private.h :=3D x86-emulate.h x86_emulate/x86_emulate.h x86_emulate/private= .h - -x86-emulate.h: x86_emulate/x86_emulate.h -x86-emulate.o x86-emulate-cov.o: x86_emulate/x86_emulate.c $(private.h) -fuzz-emul.o fuzz-emul-cov.o wrappers.o: x86-emulate.h +WRAPPED =3D $(shell sed -n 's,^ *WRAP(\([[:alnum:]_]*\));,\1,p' \ + ../../tests/x86_emulator/x86-emulate.h) =20 -$(filter x86_emulate/%.o,$(OBJS)): x86_emulate/%.o: x86_emulate/%.c $(priv= ate.h) +$(filter x86_emulate/%.o,$(OBJS)): x86_emulate/%.o: x86_emulate/%.c x86_em= ulate $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) -c -o $@ $< $(APPEND_CFLAGS) =20 -$(patsubst %.o,%-cov.o,$(filter x86_emulate/%.o,$(OBJS))): x86_emulate/%-c= ov.o: x86_emulate/%.c $(private.h) +$(patsubst %.o,%-cov.o,$(filter x86_emulate/%.o,$(OBJS))): x86_emulate/%-c= ov.o: x86_emulate/%.c x86_emulate $(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS_$*.o) $(GCOV_FLAGS) -c -o $@ $< $(AP= PEND_CFLAGS) =20 x86-insn-fuzzer.a: $(OBJS) cpuid.o @@ -70,7 +66,7 @@ distclean: clean clean: rm -f *.a *.o $(DEPS_RM) *.gcda *.gcno *.gcov rm -f afl-harness afl-harness-cov libfuzzer-harness - rm -rf x86_emulate x86-emulate.c x86-emulate.h wrappers.c + rm -rf x86_emulate =20 .PHONY: install install: all