From nobody Mon Feb 9 20:11:58 2026 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 1640104498652853.5374875744893; Tue, 21 Dec 2021 08:34:58 -0800 (PST) Received: from localhost ([::1]:48792 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzi6K-0004xJ-R2 for importer@patchew.org; Tue, 21 Dec 2021 11:34:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48706) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4k-0003Ue-DK for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:43737) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4g-0004r6-7A for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:17 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-609-uA8x1IWFOBa79ypL7uhf0Q-1; Tue, 21 Dec 2021 11:33:05 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EA3C5101F003; Tue, 21 Dec 2021 16:33:03 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.193.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id ECC1210911A5; Tue, 21 Dec 2021 16:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640104388; 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=3y5oX9qzG39mxZevA0tFyDwIjiq2HrlVXDbm0BWWuoI=; b=ZNXkh3fqLFCsrs31DUMRLcUgpkhWymNc4u5nVCb3o1ChTG3DNV128yKSksvS8dMQe8OCI6 32vQGx5arsMDJWDbNQ64r16rfxRohIsgCFedsEtuHgPM4sIBFlwMu6WA9N6Aa/SlpzyOax QKYMXo36nFl772eDPOuc4FIUzYPZih0= X-MC-Unique: uA8x1IWFOBa79ypL7uhf0Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/3] meson: reuse common_user_inc when building files specific to user-mode emulators Date: Tue, 21 Dec 2021 17:32:58 +0100 Message-Id: <20211221163300.453146-2-pbonzini@redhat.com> In-Reply-To: <20211221163300.453146-1-pbonzini@redhat.com> References: <20211221163300.453146-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, richard.henderson@linaro.org 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: 1640104499301100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f45ecf31bd..b0af02b805 100644 --- a/meson.build +++ b/meson.build @@ -2897,6 +2897,7 @@ foreach target : target_dirs else abi =3D config_target['TARGET_ABI_DIR'] target_type=3D'user' + target_inc +=3D common_user_inc qemu_target_name =3D 'qemu-' + target_name if target_base_arch in target_user_arch t =3D target_user_arch[target_base_arch].apply(config_target, strict= : false) @@ -2905,7 +2906,6 @@ foreach target : target_dirs endif if 'CONFIG_LINUX_USER' in config_target base_dir =3D 'linux-user' - target_inc +=3D include_directories('linux-user/host/' / host_arch) endif if 'CONFIG_BSD_USER' in config_target base_dir =3D 'bsd-user' --=20 2.33.1 From nobody Mon Feb 9 20:11:58 2026 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 1640104784950608.0955624020539; Tue, 21 Dec 2021 08:39:44 -0800 (PST) Received: from localhost ([::1]:55476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mziAy-0001C5-2J for importer@patchew.org; Tue, 21 Dec 2021 11:39:44 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48764) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4k-0003VC-Og for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34240) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4g-0004rL-Cm for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:18 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-438-U6JiD3ddO1a81NWvwa6RqA-1; Tue, 21 Dec 2021 11:33:06 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 613D3835E21; Tue, 21 Dec 2021 16:33:05 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.193.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E6F510911A5; Tue, 21 Dec 2021 16:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640104389; 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=6fJbVcXmjfK7yiOxQQ/pnlKHKr7JD5Q1ZEyUBPZTFTU=; b=Mf3jfAXsEMU5QI7OdKWePw4nXecb8JxVRNWPodoy7hPcJtrhtcNVr088ULjf0Kxal3/U1Z RjvMxWZsTKANhap69lLX0uw4Vc+Xrsvqgt7kLVT3G3MVv7NMLEPFJkw1ErKWnFszBN1toM 43RDVamsuKNaZX2PVGg+n4muEZ3YxS0= X-MC-Unique: U6JiD3ddO1a81NWvwa6RqA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/3] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Date: Tue, 21 Dec 2021 17:32:59 +0100 Message-Id: <20211221163300.453146-3-pbonzini@redhat.com> In-Reply-To: <20211221163300.453146-1-pbonzini@redhat.com> References: <20211221163300.453146-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, richard.henderson@linaro.org 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: 1640104787055100001 Content-Type: text/plain; charset="utf-8" Avoid polluting the compilation of common-user/ with local include files; making an include file available to common-user/ should be a deliberate decision in order to keep a clear interface that can be used by both bsd-user/ and linux-user/. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- bsd-user/{ =3D> include}/special-errno.h | 0 bsd-user/meson.build | 2 +- linux-user/{ =3D> include}/host/aarch64/host-signal.h | 0 linux-user/{ =3D> include}/host/alpha/host-signal.h | 0 linux-user/{ =3D> include}/host/arm/host-signal.h | 0 linux-user/{ =3D> include}/host/i386/host-signal.h | 0 linux-user/{ =3D> include}/host/mips/host-signal.h | 0 linux-user/{ =3D> include}/host/ppc/host-signal.h | 0 linux-user/{ =3D> include}/host/ppc64/host-signal.h | 0 linux-user/{ =3D> include}/host/riscv/host-signal.h | 0 linux-user/{ =3D> include}/host/s390/host-signal.h | 0 linux-user/{ =3D> include}/host/s390x/host-signal.h | 0 linux-user/{ =3D> include}/host/sparc/host-signal.h | 0 linux-user/{ =3D> include}/host/sparc64/host-signal.h | 0 linux-user/{ =3D> include}/host/x32/host-signal.h | 0 linux-user/{ =3D> include}/host/x86_64/host-signal.h | 0 linux-user/{ =3D> include}/special-errno.h | 0 linux-user/meson.build | 4 ++-- 18 files changed, 3 insertions(+), 3 deletions(-) rename bsd-user/{ =3D> include}/special-errno.h (100%) rename linux-user/{ =3D> include}/host/aarch64/host-signal.h (100%) rename linux-user/{ =3D> include}/host/alpha/host-signal.h (100%) rename linux-user/{ =3D> include}/host/arm/host-signal.h (100%) rename linux-user/{ =3D> include}/host/i386/host-signal.h (100%) rename linux-user/{ =3D> include}/host/mips/host-signal.h (100%) rename linux-user/{ =3D> include}/host/ppc/host-signal.h (100%) rename linux-user/{ =3D> include}/host/ppc64/host-signal.h (100%) rename linux-user/{ =3D> include}/host/riscv/host-signal.h (100%) rename linux-user/{ =3D> include}/host/s390/host-signal.h (100%) rename linux-user/{ =3D> include}/host/s390x/host-signal.h (100%) rename linux-user/{ =3D> include}/host/sparc/host-signal.h (100%) rename linux-user/{ =3D> include}/host/sparc64/host-signal.h (100%) rename linux-user/{ =3D> include}/host/x32/host-signal.h (100%) rename linux-user/{ =3D> include}/host/x86_64/host-signal.h (100%) rename linux-user/{ =3D> include}/special-errno.h (100%) diff --git a/bsd-user/special-errno.h b/bsd-user/include/special-errno.h similarity index 100% rename from bsd-user/special-errno.h rename to bsd-user/include/special-errno.h diff --git a/bsd-user/meson.build b/bsd-user/meson.build index 9fcb80c3fa..8380fa44c2 100644 --- a/bsd-user/meson.build +++ b/bsd-user/meson.build @@ -4,7 +4,7 @@ endif =20 bsd_user_ss =3D ss.source_set() =20 -common_user_inc +=3D include_directories('.') +common_user_inc +=3D include_directories('include') =20 bsd_user_ss.add(files( 'bsdload.c', diff --git a/linux-user/host/aarch64/host-signal.h b/linux-user/include/hos= t/aarch64/host-signal.h similarity index 100% rename from linux-user/host/aarch64/host-signal.h rename to linux-user/include/host/aarch64/host-signal.h diff --git a/linux-user/host/alpha/host-signal.h b/linux-user/include/host/= alpha/host-signal.h similarity index 100% rename from linux-user/host/alpha/host-signal.h rename to linux-user/include/host/alpha/host-signal.h diff --git a/linux-user/host/arm/host-signal.h b/linux-user/include/host/ar= m/host-signal.h similarity index 100% rename from linux-user/host/arm/host-signal.h rename to linux-user/include/host/arm/host-signal.h diff --git a/linux-user/host/i386/host-signal.h b/linux-user/include/host/i= 386/host-signal.h similarity index 100% rename from linux-user/host/i386/host-signal.h rename to linux-user/include/host/i386/host-signal.h diff --git a/linux-user/host/mips/host-signal.h b/linux-user/include/host/m= ips/host-signal.h similarity index 100% rename from linux-user/host/mips/host-signal.h rename to linux-user/include/host/mips/host-signal.h diff --git a/linux-user/host/ppc/host-signal.h b/linux-user/include/host/pp= c/host-signal.h similarity index 100% rename from linux-user/host/ppc/host-signal.h rename to linux-user/include/host/ppc/host-signal.h diff --git a/linux-user/host/ppc64/host-signal.h b/linux-user/include/host/= ppc64/host-signal.h similarity index 100% rename from linux-user/host/ppc64/host-signal.h rename to linux-user/include/host/ppc64/host-signal.h diff --git a/linux-user/host/riscv/host-signal.h b/linux-user/include/host/= riscv/host-signal.h similarity index 100% rename from linux-user/host/riscv/host-signal.h rename to linux-user/include/host/riscv/host-signal.h diff --git a/linux-user/host/s390/host-signal.h b/linux-user/include/host/s= 390/host-signal.h similarity index 100% rename from linux-user/host/s390/host-signal.h rename to linux-user/include/host/s390/host-signal.h diff --git a/linux-user/host/s390x/host-signal.h b/linux-user/include/host/= s390x/host-signal.h similarity index 100% rename from linux-user/host/s390x/host-signal.h rename to linux-user/include/host/s390x/host-signal.h diff --git a/linux-user/host/sparc/host-signal.h b/linux-user/include/host/= sparc/host-signal.h similarity index 100% rename from linux-user/host/sparc/host-signal.h rename to linux-user/include/host/sparc/host-signal.h diff --git a/linux-user/host/sparc64/host-signal.h b/linux-user/include/hos= t/sparc64/host-signal.h similarity index 100% rename from linux-user/host/sparc64/host-signal.h rename to linux-user/include/host/sparc64/host-signal.h diff --git a/linux-user/host/x32/host-signal.h b/linux-user/include/host/x3= 2/host-signal.h similarity index 100% rename from linux-user/host/x32/host-signal.h rename to linux-user/include/host/x32/host-signal.h diff --git a/linux-user/host/x86_64/host-signal.h b/linux-user/include/host= /x86_64/host-signal.h similarity index 100% rename from linux-user/host/x86_64/host-signal.h rename to linux-user/include/host/x86_64/host-signal.h diff --git a/linux-user/special-errno.h b/linux-user/include/special-errno.h similarity index 100% rename from linux-user/special-errno.h rename to linux-user/include/special-errno.h diff --git a/linux-user/meson.build b/linux-user/meson.build index b2f4afd5e7..de4320af05 100644 --- a/linux-user/meson.build +++ b/linux-user/meson.build @@ -4,8 +4,8 @@ endif =20 linux_user_ss =3D ss.source_set() =20 -common_user_inc +=3D include_directories('host/' / host_arch) -common_user_inc +=3D include_directories('.') +common_user_inc +=3D include_directories('include/host/' / host_arch) +common_user_inc +=3D include_directories('include') =20 linux_user_ss.add(files( 'elfload.c', --=20 2.33.1 From nobody Mon Feb 9 20:11:58 2026 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 1640104673336990.3553899181576; Tue, 21 Dec 2021 08:37:53 -0800 (PST) Received: from localhost ([::1]:52296 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzi99-0007QA-Ur for importer@patchew.org; Tue, 21 Dec 2021 11:37:51 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48718) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4k-0003Uh-AR for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:34060) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzi4g-0004rI-Bp for qemu-devel@nongnu.org; Tue, 21 Dec 2021 11:33:17 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-245-YamJh5irP0uu48OddXn5Yg-1; Tue, 21 Dec 2021 11:33:08 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B055810144E2; Tue, 21 Dec 2021 16:33:06 +0000 (UTC) Received: from avogadro.lan (unknown [10.39.193.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id B9DB110911B0; Tue, 21 Dec 2021 16:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1640104389; 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=ghU8vImoeUmOJ4z2J2xHQZnIMVYUe4vf427QoD7I7jY=; b=fgn5aaRIKO89mejaJUsM20yYm4up2+YifXRZ3mBCWGzW9dVf17T8YdasKiRXDuQTvDNctU LSzNr22DCb0A1IE0liwThnpZOjTeYjV6YMhZRQu25yXJzgbPZNtogv7crCtdDwKAwYfYX9 mpxBb1aaUP24v0Hiv7YdJwjKwn5gJNA= X-MC-Unique: YamJh5irP0uu48OddXn5Yg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/3] meson: cleanup common-user/ build Date: Tue, 21 Dec 2021 17:33:00 +0100 Message-Id: <20211221163300.453146-4-pbonzini@redhat.com> In-Reply-To: <20211221163300.453146-1-pbonzini@redhat.com> References: <20211221163300.453146-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.203, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, richard.henderson@linaro.org 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: 1640104675115100001 Content-Type: text/plain; charset="utf-8" Do not go through a static_library, which is only necessary in order to reu= se some source files between emulators and tests. Instead just place common f= iles for all user-mode emulators in common_ss, similar to what is already done f= or softmmu_ss in full system emulators. The only disadvantage is that the include_directories under bsd-user/includ= e/ and linux-user/include/ are now enabled for all targets rather than only user mode emulators. This however is not different from how include/sysemu/ is available when building user mode emulators. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Tested-by: Richard Henderson --- common-user/meson.build | 2 +- meson.build | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/common-user/meson.build b/common-user/meson.build index 5cb42bc664..26212dda5c 100644 --- a/common-user/meson.build +++ b/common-user/meson.build @@ -1,6 +1,6 @@ common_user_inc +=3D include_directories('host/' / host_arch) =20 -common_user_ss.add(files( +user_ss.add(files( 'safe-syscall.S', 'safe-syscall-error.c', )) diff --git a/meson.build b/meson.build index b0af02b805..879628ab68 100644 --- a/meson.build +++ b/meson.build @@ -2377,7 +2377,6 @@ blockdev_ss =3D ss.source_set() block_ss =3D ss.source_set() chardev_ss =3D ss.source_set() common_ss =3D ss.source_set() -common_user_ss =3D ss.source_set() crypto_ss =3D ss.source_set() hwcore_ss =3D ss.source_set() io_ss =3D ss.source_set() @@ -2629,17 +2628,6 @@ subdir('common-user') subdir('bsd-user') subdir('linux-user') =20 -common_user_ss =3D common_user_ss.apply(config_all, strict: false) -common_user =3D static_library('common-user', - sources: common_user_ss.sources(), - dependencies: common_user_ss.dependencies(), - include_directories: common_user_inc, - name_suffix: 'fa', - build_by_default: false) -common_user =3D declare_dependency(link_with: common_user) - -user_ss.add(common_user) - # needed for fuzzing binaries subdir('tests/qtest/libqos') subdir('tests/qtest/fuzz') @@ -2857,6 +2845,7 @@ common_all =3D common_ss.apply(config_all, strict: fa= lse) common_all =3D static_library('common', build_by_default: false, sources: common_all.sources() + genh, + include_directories: common_user_inc, implicit_include_directories: false, dependencies: common_all.dependencies(), name_suffix: 'fa') --=20 2.33.1