From nobody Sun May 19 09:42:15 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 1640260496478997.1408286242972; Thu, 23 Dec 2021 03:54:56 -0800 (PST) Received: from localhost ([::1]:45340 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MgR-0001Gl-HZ for importer@patchew.org; Thu, 23 Dec 2021 06:54:55 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58816) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdI-0004G2-Cg for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:40 -0500 Received: from [2a00:1450:4864:20::42f] (port=33780 helo=mail-wr1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdG-0008OK-6T for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:39 -0500 Received: by mail-wr1-x42f.google.com with SMTP id d9so11056023wrb.0 for ; Thu, 23 Dec 2021 03:51:37 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:36 -0800 (PST) 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=T5FPBJ394Dd3sA5Gnr0P+ccc+bkdQleyaVOEfIkhHPM=; b=Y5O2J9dd/8B0KGkla1flSW8t/HVVb8NPin4FRXvGZblCg42LEVQCw8eF7uig3kgWMG PnihIs1BfFoZLjn0PxA1xxw+xY8fo1tnZZCHoBjKFDa3/Pf/Tr6AJ3WxYbA0X+X4sQAK JahV1pG5JZhGq7NtPvJNrrMOUDZideHpmGG3EqsLmFGHXTd17FoG9ezwfYVs/8BzcUMm hDmxUzePK2/TalN9ubCDe6wrBc+sO/98oeVRLzj3VgOiZu7sYfhFKllR92Ot/PctpvQy 3vlqcVsO3EjVpBrQXvO7OfKkD/4EY4L5ATKusGjZi70KBZw6zsN9Nhyf9L8x4YEl1Dqb zUIA== 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=T5FPBJ394Dd3sA5Gnr0P+ccc+bkdQleyaVOEfIkhHPM=; b=LCPbMxz39w1CGC5FWICHnpy2XpzKPoB+sRf2AQogBpVGewAy8MTfEi4gMTMxyWPkkk bCNd1uw+0EN2Ag5lYFCCs0UzjpEqZocweExNHB9eZWzn6L4hly5cdiR9piinbgvW/3EJ nqT+bOnNX4NKY56FNtyoT7LtaNKTyOEryYWoFk7Y/BWX4YqipsQgDDu3qkXbVTvKbqAQ 2umJpLu+rA2jcfY3tTBN7Ln6bu0VUWdH22wR9uZE/5TRyGC5WOYFcJg6mLerd4mfywEV Hkm0+h1mLnTEgHGyjizlW5tlTgXvis+3oqYA+Gdb9vvgM9OhZdLCIGnkmAzM36QcHVQf 7QIQ== X-Gm-Message-State: AOAM530ooZx75N3XXBSQfX0+c5d5+5JkjoICs+WqmJ3yVWvqRJww/J0S sQQUcMXZ89Czy3ZCAzVFzCw1CAgbw/o= X-Google-Smtp-Source: ABdhPJyje20BI3dbbEW56CdaHqhKk8b9ipiYnVN5H7cArkcGdK2oFnEfjN15CqqBbEtQpmJG3ScWyQ== X-Received: by 2002:adf:ba8b:: with SMTP id p11mr1500761wrg.390.1640260296688; Thu, 23 Dec 2021 03:51:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/15] docker: include bison in debian-tricore-cross Date: Thu, 23 Dec 2021 12:51:20 +0100 Message-Id: <20211223115134.579235-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42f (failed) 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::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= 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: 1640260498558100001 Binutils sometimes fail to build if bison is not installed: /bin/sh ./ylwrap `test -f arparse.y || echo ./`arparse.y y.tab.c arparse.= c y.tab.h arparse.h y.output arparse.output -- -d ./ylwrap: 109: ./ylwrap: -d: not found (the correct invocation of ylwrap would have "bison -d" after the double dash). Work around by installing it in the container. Cc: Alex Benn=C3=A9e Resolves: https://gitlab.com/qemu-project/qemu/-/issues/596 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- tests/docker/dockerfiles/debian-tricore-cross.docker | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/docker/dockerfiles/debian-tricore-cross.docker b/tests/d= ocker/dockerfiles/debian-tricore-cross.docker index d8df2c6117..3f6b55562c 100644 --- a/tests/docker/dockerfiles/debian-tricore-cross.docker +++ b/tests/docker/dockerfiles/debian-tricore-cross.docker @@ -16,6 +16,7 @@ MAINTAINER Philippe Mathieu-Daud=C3=A9 RUN apt update && \ DEBIAN_FRONTEND=3Dnoninteractive apt install -yy eatmydata && \ DEBIAN_FRONTEND=3Dnoninteractive eatmydata apt install -yy \ + bison \ bzip2 \ ca-certificates \ ccache \ --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260416618821.6716756786578; Thu, 23 Dec 2021 03:53:36 -0800 (PST) Received: from localhost ([::1]:41406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mf8-00075Z-8F for importer@patchew.org; Thu, 23 Dec 2021 06:53:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0004HP-Co for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:41 -0500 Received: from [2a00:1450:4864:20::42e] (port=34742 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdG-0008ON-Ps for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:41 -0500 Received: by mail-wr1-x42e.google.com with SMTP id s1so11008160wrg.1 for ; Thu, 23 Dec 2021 03:51:38 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:37 -0800 (PST) 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=1vV2h+B5IOnbHlbjwkV4mqWwGFqqRbWIHymfX5TQVsM=; b=W+R0kRf/JcsD3Oj8G+3A6TN58Iq91ZyOm4T9t6FnB18Q1q8HK19PLcweyBPcIgZrsg NJ9XsYpojH87DWK0eZSih3JtDgk55O6xB5Zeofl0ekkjnPnsbDDhZmoFbEE67NHZ3GBH ZsSqs+a8TRkVNsmD92fiFexe4jT+eDvcLsD8blNRza+BxmmTgxaB3hEPC1bo614MQE// qcad59/C9Suz5D+044UlxIXitIZHfPs99SHDjHRjduxNZdmk1eqJ3OWA6yqOvH4Qb9te gID6JDm/ICaqfPmIsMRmWVsFGWoy+YBduzjG9sqSM5ocndI0jAErWUJWQjcVikKAVERi P8ZQ== 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=1vV2h+B5IOnbHlbjwkV4mqWwGFqqRbWIHymfX5TQVsM=; b=BAn20hY9yd682n9wkw3XKjbLhAJGL0xvmfyTs9mgvK1vxhMTBQ16cnUluF3NciMj1t /st881CJ/hIIbQCCriGmF8UL12iav8EayR5HJPY4RPlRragBiGFYqu4CwogNsTwEwhUg 8VJyyzyVsS+O46/O63D/BA1ZcklFoVWU3nb7edC25LwHM3x6xHYeahUbQU3hknyLOuA7 XHHk462ixRODQ5i5tdLH3t3uJiZFOsgYSlaWfvn1F/t9Fe5ywUaCjaCQcBkw6zsbISP/ K+X7vOCUF+PIC4Dhsz+lhpq7XS+sNdHWJ+EY/xShGnA53lO23hQEmCDoXeWL3f+9TeaT tlNg== X-Gm-Message-State: AOAM532o6t6QXFnaQB4NehHEY8K6PAcf8Ycvrp/Yb8UbsruTHVn3Eam/ gIii/O22cLpPem9IU3v5bEvOyeCxlso= X-Google-Smtp-Source: ABdhPJxlitIAyseRiJUoO/AgGdQGiSRCdBecGV3RyFpz7byb3s3E21z4yimiWkUJatzvM47J3wvm8A== X-Received: by 2002:a5d:6dad:: with SMTP id u13mr1582907wrs.604.1640260297255; Thu, 23 Dec 2021 03:51:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/15] meson: reuse common_user_inc when building files specific to user-mode emulators Date: Thu, 23 Dec 2021 12:51:21 +0100 Message-Id: <20211223115134.579235-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) 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::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260416971100003 Content-Type: text/plain; charset="utf-8" Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- 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 Sun May 19 09:42:15 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 1640260681663449.9103390499713; Thu, 23 Dec 2021 03:58:01 -0800 (PST) Received: from localhost ([::1]:53982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MjQ-00076g-Ms for importer@patchew.org; Thu, 23 Dec 2021 06:58:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0004Hk-W0 for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:44 -0500 Received: from [2a00:1450:4864:20::42d] (port=42920 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdH-0008OV-5D for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:41 -0500 Received: by mail-wr1-x42d.google.com with SMTP id w20so1959694wra.9 for ; Thu, 23 Dec 2021 03:51:38 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:37 -0800 (PST) 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=LsebaxjK4X3kfi6gKUiYbbi2y0XGxqQY+SM4Dw2Hp9Y=; b=K2H/Gx4H9z6sT8uRrgexTMP4fQ9zGUb4Osy85e819eNh8vUkDaK3UvHLKJJntkOrbk i/Z12lXSMcfv7oyo7MSCCOWvOvYu/6zO+up/dPYzQ6Y9raiMmVaOXOioSzUwHpPZht7j l9HYq0vfY8n7qu/HcSHXvEUlk8yJSLP11D/TU//d6oW/+FOfiWSUTcOp2jdToydsUnaS +Eu9++d4/QDfvV7Cad1aT4ku64Uxmi9MVfiMIWRh7pby7i6/SYxMdrWb+yJSq4UH9pXg 7yiMY6Zy2W3LHrweMio2PDyVnMtij8sqRC3ajJwG20v7HL9+GDB3EOBoVV0V2n1zgGMj zuZQ== 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=LsebaxjK4X3kfi6gKUiYbbi2y0XGxqQY+SM4Dw2Hp9Y=; b=EwNU1U+9hX2jwu9aXRe6bx0YWI1czvUjZkpSHe8EP6hcFir6S1kMBKoRy7IrtJfRdz PGJqTXuTjQIr5geGGabgzbdWaqN4aivqNkTdQxoYTLBHwpAmPqXy7GkX5+raffqGA8kN cvcZmS7EoJvlIOGQWZ20LXqoPvs2TTLQsz3NDf+yWCLYGlFlAH/4BU4WLHcE14l2X0NB GG1kxNeVjiTxY1ADloZJJNMTNr3cvrAYLQEiAl1yDQyzocZPv9PsH15VpQjtQVvX1rtY /w5fa80O6BG2EBUiXqP4dz5IaKkm5FdhB8FfwfKWMG36dAg80p97ZKiVEWl0axCctb7l EGVg== X-Gm-Message-State: AOAM531DXXOO2YtjAN/OGC9gnUlmikAWr0owjAr3ChJw4KZhAQqXZQYj EkaZrKjrwNrCJjyZdSQzx2CdIEX60+0= X-Google-Smtp-Source: ABdhPJwVhjEMhd4B4v7skS0O7QbGCrNAL8lcxyk+AJUaR5KQ5VAvo82pUPEHMu+PiunWhRAXxiRSWg== X-Received: by 2002:a05:6000:1c7:: with SMTP id t7mr1577554wrx.656.1640260297808; Thu, 23 Dec 2021 03:51:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/15] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Date: Thu, 23 Dec 2021 12:51:22 +0100 Message-Id: <20211223115134.579235-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) 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::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260683434100001 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/. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- 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 Sun May 19 09:42:15 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 1640260564896273.50480833709116; Thu, 23 Dec 2021 03:56:04 -0800 (PST) Received: from localhost ([::1]:49922 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MhX-0004H7-Sc for importer@patchew.org; Thu, 23 Dec 2021 06:56:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0004Hj-W9 for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:45 -0500 Received: from [2a00:1450:4864:20::432] (port=34746 helo=mail-wr1-x432.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdH-0008Oa-JN for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:41 -0500 Received: by mail-wr1-x432.google.com with SMTP id s1so11008235wrg.1 for ; Thu, 23 Dec 2021 03:51:39 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:38 -0800 (PST) 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=ogRjYWYAou3o09X8Bc73cvf2JYVG5TqbPazpTT+XBgE=; b=FATWLlisAC9pofBLxv7odWrHW/yw/YR3yZaGVMadXw+P5XwSNfeXOQ84CmnOywPlPU TIICOlHEKrtA3dZck5otrNg+J+LO2IyKwaS0KSLny5ZXz2jyJ8L0BMcDcX3j0TifJmeh +fh5JbcdlvZUm38cFURJkRnrL9T/18K0WVHDDDrIhsFSSUpodaTpKTwN72TZzbM9s61j mKZpW6DZRt/VShFRTi4FYadFd+lEGQQcCfjeNeBr1zKUaykVcJ5HJOyvstKNrDew0RR5 ZnLe/iXUxa5ajSv2Zf28icubtA3g+xtn1bF6FpFJDFbkUYq/kVbsGDeIUQRMPYTcH+mc KLnA== 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=ogRjYWYAou3o09X8Bc73cvf2JYVG5TqbPazpTT+XBgE=; b=ZVpsHAIVSSgNWyUv6Nw0LoE/Ky0jh/Z9RgPfS8VBFY9XznxORsCkBtGpZ2ztVdlF93 a28e3oge2t4fyl0wRDXtdQuY3sxvGFpFc74PT3AHPRjndiP/HEDUnHSVqJfCWyoqefSX 2XRKd/f7UhM7RQ+TrEnXKDw33xBC0LIsqzckdX6+4PH6qdumoSPpYh3hmOTX1XmmLMJB nIEzZHJUdpBjz7lr6yryVOdruQncZlw7Wh1pJB28oFhpdDj3oyGOsvoPqXCT+9OaWhIN 7cEoN7GVdhvShCAN95HZIPvzSSfK3JO0u6LbiLqu6TLMoEm3xRm/YCvUfX2T+taWEyBg CP1Q== X-Gm-Message-State: AOAM530X+VEhjjiMPUj5Pbxp5NdoK8i/MDfgW/yWaT0i8KxGiw0O8EnA 6VG3eN0gWL3BatN30uoVsCGXXC3ed38= X-Google-Smtp-Source: ABdhPJyCIVgPzzJe8InQJwZRQUfxYpFBxPvXUEHl+dl+Y+VOheK2xuZ8YYjD6ID/vSOUBFtx4jRPOg== X-Received: by 2002:adf:f6c1:: with SMTP id y1mr1501898wrp.351.1640260298379; Thu, 23 Dec 2021 03:51:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/15] meson: cleanup common-user/ build Date: Thu, 23 Dec 2021 12:51:23 +0100 Message-Id: <20211223115134.579235-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::432 (failed) 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::432; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x432.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260565227100001 Content-Type: text/plain; charset="utf-8" It is not necessary to have a separate static_library just for common_user files; using the one that already covers the rest of common_ss is enough unless you need to reuse some source files between emulators and tests. Just place common files for all user-mode emulators in common_ss, similar to what is already done for 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. Tested-by: Richard Henderson Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- 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 From nobody Sun May 19 09:42:15 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 1640260776277876.4777412650368; Thu, 23 Dec 2021 03:59:36 -0800 (PST) Received: from localhost ([::1]:58614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mkx-00027V-9R for importer@patchew.org; Thu, 23 Dec 2021 06:59:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58918) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0004I1-EZ for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:45 -0500 Received: from [2a00:1450:4864:20::42b] (port=36419 helo=mail-wr1-x42b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdI-0008Or-DU for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:42 -0500 Received: by mail-wr1-x42b.google.com with SMTP id r17so10965510wrc.3 for ; Thu, 23 Dec 2021 03:51:40 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:38 -0800 (PST) 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=z6I+SMUEMqCO+sBfVu8hmaBQHAkiAEVjZO5GR+m0mdQ=; b=oEurIMHVEDG6uq2rzE+Y9EaZNaWCUjHzi9AqWKhJNpgi1ukaV+Om+TcTsd+lK8qOd9 Z8gPNcQpxB8lBVQp5YpN7stfOOrLjnEPDd/VylNIl7ce4Yz7tQ0EIzpjTy5maRRAMmDk HFz1q+ZKsebx+qA1O39DoO9pUD1yyahLqOdHo8mzd6wi7q7mlYyy/6ZEsbMgoO9zRdrm jVOgdBGMzJ6YoAKZKhyxLZq85m157//S37jYNaJSK5yjSjmYMyxAM+JESKjEk7LIGDxw HNu+b/FoXphPCjv2PRiyHw+tCVm5rJZLy6q4IaLdWUNwEf1Aez1SUwazNY3jfJ0QWlAp kJKg== 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=z6I+SMUEMqCO+sBfVu8hmaBQHAkiAEVjZO5GR+m0mdQ=; b=OA1Eb4ujjXd9tMgFImYr0KuvHwr1z8sEegwCvI5qK01iKoLwu0+lHZqfbBbEb5Vhiy tz2MKNBwtSQBUd4u8YhH6GwCh59xABxQbaMLouJWtkFdkUQF6ZKWMNdRH9S84AOfrFZD Ec3HYoscpdODOMafwN4froG92izrGOu9uWHKwZZHWn+CBYGbIAbzXGOpI349bN9A4hbP vqH09bzPYQDAWibIxLuuhvsaYjQPr8oAMgsOPwzTJjyNHxHeU60yAmTA/cvrYvyFL4ZB NvNTT7fQ8lxNFkCYU6nOg0qv4bbQGOgRbtgVL7YydS9KcZnajeRAYk9ezp2sAUAisrre Ftsg== X-Gm-Message-State: AOAM5329r7+XlfwcGOE0Redm04zwP1jGEGByA49ISuHSKdWLKGg8NDNX WtJ7ezB6yopjNUgE2OmVfpN74bJtF8U= X-Google-Smtp-Source: ABdhPJyAvHqjnq/kor6PlyoNIw8gXRsGiB87W7c2SSJo/DQLQq1isR2fEAe+BuANakqzyz4ztJdAqg== X-Received: by 2002:a5d:6b8f:: with SMTP id n15mr1499493wrx.189.1640260298933; Thu, 23 Dec 2021 03:51:38 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/15] block/file-posix: Simplify the XFS_IOC_DIOINFO handling Date: Thu, 23 Dec 2021 12:51:24 +0100 Message-Id: <20211223115134.579235-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42b (failed) 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::42b; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42b.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: 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: 1640260779808100001 Content-Type: text/plain; charset="utf-8" From: Thomas Huth The handling for the XFS_IOC_DIOINFO ioctl is currently quite excessive: This is not a "real" feature like the other features that we provide with the "--enable-xxx" and "--disable-xxx" switches for the configure script, since this does not influence lots of code (it's only about one call to xfsctl() in file-posix.c), so people don't gain much with the ability to disable this with "--disable-xfsctl". It's also unfortunate that the ioctl will be disabled on Linux in case the user did not install the right xfsprogs-devel package before running configure. Thus let's simplify this by providing the ioctl definition on our own, so we can completely get rid of the header dependency and thus the related code in the configure script. Suggested-by: Paolo Bonzini Signed-off-by: Thomas Huth Message-Id: <20211215125824.250091-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini --- block/file-posix.c | 37 ++++++++++++++++--------------------- configure | 31 ------------------------------- meson.build | 1 - 3 files changed, 16 insertions(+), 53 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index b283093e5b..1f1756e192 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -106,10 +106,6 @@ #include #endif =20 -#ifdef CONFIG_XFS -#include -#endif - /* OS X does not have O_DSYNC */ #ifndef O_DSYNC #ifdef O_SYNC @@ -156,9 +152,6 @@ typedef struct BDRVRawState { int perm_change_flags; BDRVReopenState *reopen_state; =20 -#ifdef CONFIG_XFS - bool is_xfs:1; -#endif bool has_discard:1; bool has_write_zeroes:1; bool discard_zeroes:1; @@ -409,14 +402,22 @@ static void raw_probe_alignment(BlockDriverState *bs,= int fd, Error **errp) if (probe_logical_blocksize(fd, &bs->bl.request_alignment) < 0) { bs->bl.request_alignment =3D 0; } -#ifdef CONFIG_XFS - if (s->is_xfs) { - struct dioattr da; - if (xfsctl(NULL, fd, XFS_IOC_DIOINFO, &da) >=3D 0) { - bs->bl.request_alignment =3D da.d_miniosz; - /* The kernel returns wrong information for d_mem */ - /* s->buf_align =3D da.d_mem; */ - } + +#ifdef __linux__ + /* + * The XFS ioctl definitions are shipped in extra packages that might + * not always be available. Since we just need the XFS_IOC_DIOINFO ioc= tl + * here, we simply use our own definition instead: + */ + struct xfs_dioattr { + uint32_t d_mem; + uint32_t d_miniosz; + uint32_t d_maxiosz; + } da; + if (ioctl(fd, _IOR('X', 30, struct xfs_dioattr), &da) >=3D 0) { + bs->bl.request_alignment =3D da.d_miniosz; + /* The kernel returns wrong information for d_mem */ + /* s->buf_align =3D da.d_mem; */ } #endif =20 @@ -798,12 +799,6 @@ static int raw_open_common(BlockDriverState *bs, QDict= *options, #endif s->needs_alignment =3D raw_needs_alignment(bs); =20 -#ifdef CONFIG_XFS - if (platform_test_xfs_fd(s->fd)) { - s->is_xfs =3D true; - } -#endif - bs->supported_zero_flags =3D BDRV_REQ_MAY_UNMAP | BDRV_REQ_NO_FALLBACK; if (S_ISREG(st.st_mode)) { /* When extending regular files, we get zeros from the OS */ diff --git a/configure b/configure index 8ccfe51673..b66ab31834 100755 --- a/configure +++ b/configure @@ -291,7 +291,6 @@ EXTRA_CXXFLAGS=3D"" EXTRA_LDFLAGS=3D"" =20 xen_ctrl_version=3D"$default_feature" -xfs=3D"$default_feature" membarrier=3D"$default_feature" vhost_kernel=3D"$default_feature" vhost_net=3D"$default_feature" @@ -1019,10 +1018,6 @@ for opt do ;; --enable-opengl) opengl=3D"yes" ;; - --disable-xfsctl) xfs=3D"no" - ;; - --enable-xfsctl) xfs=3D"yes" - ;; --disable-zlib-test) ;; --enable-guest-agent) guest_agent=3D"yes" @@ -1429,7 +1424,6 @@ cat << EOF avx512f AVX512F optimization support replication replication support opengl opengl support - xfsctl xfsctl support qom-cast-debug cast debugging support tools build qemu-io, qemu-nbd and qemu-img tools bochs bochs image format support @@ -2321,28 +2315,6 @@ EOF fi fi =20 -########################################## -# xfsctl() probe, used for file-posix.c -if test "$xfs" !=3D "no" ; then - cat > $TMPC << EOF -#include /* NULL */ -#include -int main(void) -{ - xfsctl(NULL, 0, 0, NULL); - return 0; -} -EOF - if compile_prog "" "" ; then - xfs=3D"yes" - else - if test "$xfs" =3D "yes" ; then - feature_not_found "xfs" "Install xfsprogs/xfslibs devel" - fi - xfs=3Dno - fi -fi - ########################################## # plugin linker support probe =20 @@ -3454,9 +3426,6 @@ echo "CONFIG_BDRV_RO_WHITELIST=3D$block_drv_ro_whitel= ist" >> $config_host_mak if test "$block_drv_whitelist_tools" =3D "yes" ; then echo "CONFIG_BDRV_WHITELIST_TOOLS=3Dy" >> $config_host_mak fi -if test "$xfs" =3D "yes" ; then - echo "CONFIG_XFS=3Dy" >> $config_host_mak -fi qemu_version=3D$(head $source_path/VERSION) echo "PKGVERSION=3D$pkgversion" >>$config_host_mak echo "SRC_PATH=3D$source_path" >> $config_host_mak diff --git a/meson.build b/meson.build index 879628ab68..993a591983 100644 --- a/meson.build +++ b/meson.build @@ -3422,7 +3422,6 @@ if spice_protocol.found() summary_info +=3D {' spice server support': spice} endif summary_info +=3D {'rbd support': rbd} -summary_info +=3D {'xfsctl support': config_host.has_key('CONFIG_XFS')} summary_info +=3D {'smartcard support': cacard} summary_info +=3D {'U2F support': u2f} summary_info +=3D {'libusb': libusb} --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260907800344.46276280806217; Thu, 23 Dec 2021 04:01:47 -0800 (PST) Received: from localhost ([::1]:34672 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mn4-0005Cd-KY for importer@patchew.org; Thu, 23 Dec 2021 07:01:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0004I0-EJ for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:45 -0500 Received: from [2a00:1450:4864:20::435] (port=39841 helo=mail-wr1-x435.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0008P3-2Z for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:42 -0500 Received: by mail-wr1-x435.google.com with SMTP id s1so10940101wra.6 for ; Thu, 23 Dec 2021 03:51:40 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:39 -0800 (PST) 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=55OiswjpjjV/NblsZfejYWi2CNoYsxBbbkANqJNLbCI=; b=eKHbb+7Qvvn9QA+POk+FrfYvl/5bqVe4OFEm1fk3hhawWkqv7jFo/WIqmElpyvWmV+ kFr1qXqyoQGV0TwZXLkW7peu2ah6DssDp2XjNDanQBdyw0civ0JVI2/lBNq674bo3sse qsXhv3X26LnBXKMtPlPj0e435hO8sHW71Xe7BogHetbX3+ZxC1/N46b8HblMa1Cizb1f B4LWy0+zKJfkZww9pUrCL8rYSxpL7ms7EpGTWyA7+a6U2BNIVXWlhHAXkCQF9/vNQbpb qt8s18neaF2mzD7qYv4uKGR5pSLGMGOKpjTUPmo3SX7wK3L9Qcjn5gM3ynNwHH55htTm f9HA== 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=55OiswjpjjV/NblsZfejYWi2CNoYsxBbbkANqJNLbCI=; b=RuIXBokhUEKe86O9kgfLhlDq7gK++mbsBlLBMQT1i7/QwSKlDdWC1H36TG5ujLlmKI Cp1X7E7IgsKWqgg+gwr9MhNVTgmJBlkdiFjbfhdCCzw6OFCol5rzz+y5/CCsytzzwgae ZCDkWfX2HFQK7F28CpDNMQlNuxHrquBHk3Mg8qIaZvbck0erieyRjzgTNCLh+FXlMhHF cuZ/bUqXrPW+4GJyjYfyIjfs2qr7AFoE2VFrWB6Zb1rGPrxzfO4I7xnRguCw6yHxXNFq /+JGzRH9Qxf9Defxrpcoueo/l23/pyGnzGVgtygsNpUiFlthKxR5M5Hncn0yhSotOABY +QqA== X-Gm-Message-State: AOAM532uCRIA4KSyXcrIllC4UFt92O8OpixhBtoi2uf23t3BMWwY+XGU QArlX3agyDBDgKK2ptMoNxDrQzAJpTY= X-Google-Smtp-Source: ABdhPJx+2vkMXOZP7Nhw/Ary6NfAD5Ac1hotY66gtPzOjrGtMmfPEogGJARlSLSFoiCegKtLYoq68Q== X-Received: by 2002:a05:6000:2ce:: with SMTP id o14mr1536783wry.70.1640260299586; Thu, 23 Dec 2021 03:51:39 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/15] configure: simplify creation of plugin symbol list Date: Thu, 23 Dec 2021 12:51:25 +0100 Message-Id: <20211223115134.579235-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::435 (failed) 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::435; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x435.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260909051100001 Content-Type: text/plain; charset="utf-8" --dynamic-list is present on all supported ELF (not Windows or Darwin) platforms, since it dates back to 2006; -exported_symbols_list is likewise present on all supported versions of macOS. Do not bother doing a functional test in configure. Remove the file creation from configure as well: for Darwin, move the the creation of the Darwin-formatted symbols to meson; for ELF, use the file in the source path directly and switch from -Wl, to -Xlinker to not break weird paths that include a comma. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 80 --------------------------------------------- plugins/meson.build | 11 +++++-- 2 files changed, 8 insertions(+), 83 deletions(-) diff --git a/configure b/configure index b66ab31834..0306f0c8bc 100755 --- a/configure +++ b/configure @@ -78,7 +78,6 @@ TMPC=3D"${TMPDIR1}/${TMPB}.c" TMPO=3D"${TMPDIR1}/${TMPB}.o" TMPCXX=3D"${TMPDIR1}/${TMPB}.cxx" TMPE=3D"${TMPDIR1}/${TMPB}.exe" -TMPTXT=3D"${TMPDIR1}/${TMPB}.txt" =20 rm -f config.log =20 @@ -2315,69 +2314,6 @@ EOF fi fi =20 -########################################## -# plugin linker support probe - -if test "$plugins" !=3D "no"; then - - ######################################### - # See if --dynamic-list is supported by the linker - - ld_dynamic_list=3D"no" - cat > $TMPTXT < $TMPC < -void foo(void); - -void foo(void) -{ - printf("foo\n"); -} - -int main(void) -{ - foo(); - return 0; -} -EOF - - if compile_prog "" "-Wl,--dynamic-list=3D$TMPTXT" ; then - ld_dynamic_list=3D"yes" - fi - - ######################################### - # See if -exported_symbols_list is supported by the linker - - ld_exported_symbols_list=3D"no" - cat > $TMPTXT <> $config_host_mak - # Copy the export object list to the build dir - if test "$ld_dynamic_list" =3D "yes" ; then - echo "CONFIG_HAS_LD_DYNAMIC_LIST=3Dyes" >> $config_host_mak - ld_symbols=3Dqemu-plugins-ld.symbols - cp "$source_path/plugins/qemu-plugins.symbols" $ld_symbols - elif test "$ld_exported_symbols_list" =3D "yes" ; then - echo "CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST=3Dyes" >> $config_host_mak - ld64_symbols=3Dqemu-plugins-ld64.symbols - echo "# Automatically generated by configure - do not modify" > $ld64_sym= bols - grep 'qemu_' "$source_path/plugins/qemu-plugins.symbols" | sed 's/;//g' |= \ - sed -E 's/^[[:space:]]*(.*)/_\1/' >> $ld64_symbols - else - error_exit \ - "If \$plugins=3Dyes, either \$ld_dynamic_list or " \ - "\$ld_exported_symbols_list should have been set to 'yes'." - fi fi =20 if test -n "$gdb_bin"; then diff --git a/plugins/meson.build b/plugins/meson.build index b3de57853b..d0a2ee94cf 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,10 +1,15 @@ plugin_ldflags =3D [] # Modules need more symbols than just those in plugins/qemu-plugins.symbols if not enable_modules - if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags =3D ['-Wl,--dynamic-list=3Dqemu-plugins-ld.symbols'] - elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host + if targetos =3D=3D 'darwin' + qemu_plugins_symbols_list =3D configure_file( + input: files('qemu-plugins.symbols'), + output: 'qemu-plugins-ld64.symbols', + capture: true, + command: ['sed', '-ne', 's/^[[:space:]]*\\(qemu_.*\\);/_\\1/p', '@IN= PUT@']) plugin_ldflags =3D ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symb= ols'] + else + plugin_ldflags =3D ['-Xlinker', '--dynamic-list=3D' + (meson.project_s= ource_root() / 'plugins/qemu-plugins.symbols')] endif endif =20 --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260567051599.8921558338355; Thu, 23 Dec 2021 03:56:07 -0800 (PST) Received: from localhost ([::1]:50044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MhZ-0004Lm-Rq for importer@patchew.org; Thu, 23 Dec 2021 06:56:06 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0004Hz-DO for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:45 -0500 Received: from [2a00:1450:4864:20::42e] (port=37405 helo=mail-wr1-x42e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0008PU-Li for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:43 -0500 Received: by mail-wr1-x42e.google.com with SMTP id t26so10947717wrb.4 for ; Thu, 23 Dec 2021 03:51:40 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:39 -0800 (PST) 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=vmTIMyAdr5v455+RyAf/WlQE2D/VjJkdmaYmn7hvd+w=; b=c+xRP/3LbULORcf1ve2v4jDKUot9lf+tWVPBmLPqqQEOfhNriBm3aJqWxgxQF63ep8 xl90gqENE6zGwc7Yyb0ULbtLW0Iuelo4mdHbuMrzO8seQwJToBlIcTE/TK3hn3pLA8Ba e20wAvGMC0qxygj2SNugDZyNpKmH5JZRjkxqBsU0C/e6ZWo9r0Q6RkF7DvJedPl3wMtr LBHGqTy5cqt2ZE7+OZxKu8WEC//IrkZWYdrFkmq3efL0EmwLA1wxFELPXk5RYwH+kB5Q Tz+/KXyZ5N7qalTsDK6Yt0cTtqHyRCai6vXZHMDlM9qiSF0g4j4+TQXTAVlbamdJybE0 +RJw== 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=vmTIMyAdr5v455+RyAf/WlQE2D/VjJkdmaYmn7hvd+w=; b=JwdBGyovnWITxWVG69clry9wwmtL8UQst5VavwjzbJouODqol/PCicr2Kvd9GvXoqg GpGMtq2BPdOw+C8av4w4IghApVbu6OlcJrjrsmgg7MWrhzs1fsm7Nt1nnrKOvRGwV3Kh 4hZI/SFLWpMNoQsZsm9mBPAu+ukZlvVlqBkCntVwmSSeQsIVisUlaUXZrB3E0q6l4kaD Ph+V19LdqIsn43HpWfQfiKuD6vOWx4tp9KYczgzqf0b0EkLJY2g3aSq7arhymGkuJ4D2 ufHTptyHn3f/WXillaGsKUsPEaqSBgcrTNnCpUzatMeoM97VrHYSvG5XlsTSfCItpN+2 3Jgg== X-Gm-Message-State: AOAM532ySG1wiuUFdC8xAM07oGNE9Ic5Gflo938XMVkCyIJ+yLOuPbCL reaGxAr7xK5xiJgosNruykzdCRN9lj0= X-Google-Smtp-Source: ABdhPJwAw+dYnXDOdR1p3CSnCslPz/VPuZXegp+a8zZyVZvNh1EommsHqTTnpwtyOGSRavgzU+ZstQ== X-Received: by 2002:a05:6000:1543:: with SMTP id 3mr1550012wry.140.1640260300113; Thu, 23 Dec 2021 03:51:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/15] configure: do not set bsd_user/linux_user early Date: Thu, 23 Dec 2021 12:51:26 +0100 Message-Id: <20211223115134.579235-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42e (failed) 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::42e; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42e.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260567503100001 Content-Type: text/plain; charset="utf-8" Similar to other optional features, leave the variables empty and compute the actual value later. Use the existence of include or source directories to detect whether an OS or CPU supports respectively bsd-user and linux-use= r. For now, BSD user-mode emulation is buildable even on TCI-only architectures. This probably will change once safe signals are brought over from linux-user. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 0306f0c8bc..6516ec243c 100755 --- a/configure +++ b/configure @@ -320,8 +320,8 @@ linux=3D"no" solaris=3D"no" profiler=3D"no" softmmu=3D"yes" -linux_user=3D"no" -bsd_user=3D"no" +linux_user=3D"" +bsd_user=3D"" pkgversion=3D"" pie=3D"" qom_cast_debug=3D"yes" @@ -538,7 +538,6 @@ gnu/kfreebsd) ;; freebsd) bsd=3D"yes" - bsd_user=3D"yes" make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; @@ -583,7 +582,6 @@ haiku) ;; linux) linux=3D"yes" - linux_user=3D"yes" vhost_user=3D${default_feature:-yes} ;; esac @@ -1257,18 +1255,26 @@ if eval test -z "\${cross_cc_$cpu}"; then cross_cc_vars=3D"$cross_cc_vars cross_cc_${cpu}" fi =20 -# For user-mode emulation the host arch has to be one we explicitly -# support, even if we're using TCI. -if [ "$ARCH" =3D "unknown" ]; then - bsd_user=3D"no" - linux_user=3D"no" -fi - default_target_list=3D"" deprecated_targets_list=3Dppc64abi32-linux-user deprecated_features=3D"" mak_wilds=3D"" =20 +if [ "$linux_user" !=3D no ]; then + if [ "$targetos" =3D linux ] && [ -d $source_path/linux-user/host/$cpu= ]; then + linux_user=3Dyes + elif [ "$linux_user" =3D yes ]; then + error_exit "linux-user not supported on this architecture" + fi +fi +if [ "$bsd_user" !=3D no ]; then + if [ "$bsd_user" =3D "" ]; then + test $targetos =3D freebsd && bsd_user=3Dyes + fi + if [ "$bsd_user" =3D yes ] && ! [ -d $source_path/bsd-user/$targetos ]= ; then + error_exit "bsd-user not supported on this host OS" + fi +fi if [ "$softmmu" =3D "yes" ]; then mak_wilds=3D"${mak_wilds} $source_path/configs/targets/*-softmmu.mak" fi --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260773733671.3120311637731; Thu, 23 Dec 2021 03:59:33 -0800 (PST) Received: from localhost ([::1]:58574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mku-00025o-HP for importer@patchew.org; Thu, 23 Dec 2021 06:59:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0004I2-Ea for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:45 -0500 Received: from [2a00:1450:4864:20::42d] (port=35766 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdJ-0008Pc-Sf for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:43 -0500 Received: by mail-wr1-x42d.google.com with SMTP id j18so10979858wrd.2 for ; Thu, 23 Dec 2021 03:51:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:40 -0800 (PST) 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=iXaX0NZlXf5xtjrp7wFL+/5LpJ8uJ0qMhM0hjMnqlVg=; b=U8ME/HgKRojG/XlJO+pF6YKGeKVKmzR/IKPm7e3RpWl1AcPjQclKXcLVctJi2eCtIX yCTWBDBYiB4glTKKKQI48I42pXRqhNE9y/vn9J5gLCeDbVTkk2nypkKpQRcuXLRQTm1S FPs3dhkJRM6aNr4Neb/1Cpy421E2WSpe5uh//lQVlm1oXLCW/ZT+f5vNK7TMrJwLN+IM GaZQyc5IDVthLpoBVoNt8SaHpXnKzkrIEsG3du4ekN8/Fqb409XpJEYr0xBWVkDtuNY6 eWENqgbIUCjGuuTi+46QiCXa3yjkebO5FfnTlNgo2z7d+mu0ElaPYZ0TMfDIENvpA9Go DiKQ== 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=iXaX0NZlXf5xtjrp7wFL+/5LpJ8uJ0qMhM0hjMnqlVg=; b=K/w5F/MjnlTZL2yXuAJPdKRRjLOWJeS7Lb9tqQhASMVDWcVIGcAb6lezCVbGJ6HW94 5JtA4gimBk8r/8y/rven9sGvxet46TYYrLE0+X81r8yPoNqAZXFDYmhCnonqK/bpYkrd 2+0c+c73IqGz+p3HAxFMfxbWo1WNvE1pNKDoi/fs9YNzWg//LGbi273DAOtRvHsWx7Gs i1DQOhQY8xs67mxQwHu2XIk2JZdqZy1+VgG4CPvjIG1s+gikTUxCNDWGUzmY83uZqgAf 30O8A4DrbjLvVlm6F2d52TDvTSu8aY/eBW3eyhJ/PuP2ylNPHiaRj5WZ2XvT0Kw+r1a4 lMTw== X-Gm-Message-State: AOAM53313q1APnucfxrIdIxk+pAX4zrf8HsmWEtXHY/b5YFr7Ej2mfgP JTQ5RWrv9K/xRSwAX48IrJ2A+cISbdE= X-Google-Smtp-Source: ABdhPJzPj6dyrdb6UAHC8hO362Jxb4Uk5fmGCM5lu24bj1OdRyduZ9S4G4ZMfXYoITMXzLVNVd7AmQ== X-Received: by 2002:a5d:6d0a:: with SMTP id e10mr1520585wrq.65.1640260300662; Thu, 23 Dec 2021 03:51:40 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/15] configure, makefile: remove traces of really old files Date: Thu, 23 Dec 2021 12:51:27 +0100 Message-Id: <20211223115134.579235-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) 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::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson 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: 1640260775501100001 Content-Type: text/plain; charset="utf-8" These files have been removed for more than year in the best case, or for more than ten years for some really old TCG files. Remove any traces of it. Acked-by: Richard Henderson Signed-off-by: Paolo Bonzini --- Makefile | 11 ++++------- configure | 9 --------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 74c5b46d38..06ad8a61e1 100644 --- a/Makefile +++ b/Makefile @@ -205,14 +205,11 @@ recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) clean: recurse-clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean || : -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) clean-ctlist || : -# avoid old build problems by removing potentially incorrect old files - rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h find . \( -name '*.so' -o -name '*.dll' -o -name '*.[oda]' \) -type f \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-aarch64.a \ ! -path ./roms/edk2/ArmPkg/Library/GccLto/liblto-arm.a \ -exec rm {} + - rm -f TAGS cscope.* *.pod *~ */*~ - rm -f fsdev/*.pod scsi/*.pod + rm -f TAGS cscope.* *~ */*~ =20 VERSION =3D $(shell cat $(SRC_PATH)/VERSION) =20 @@ -223,10 +220,10 @@ qemu-%.tar.bz2: =20 distclean: clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak config-host.h* config-poison.h + rm -f config-host.mak config-poison.h rm -f tests/tcg/config-*.mak - rm -f config-all-disas.mak config.status - rm -f roms/seabios/config.mak roms/vgabios/config.mak + rm -f config.status + rm -f roms/seabios/config.mak rm -f qemu-plugins-ld.symbols qemu-plugins-ld64.symbols rm -f *-config-target.h *-config-devices.mak *-config-devices.h rm -rf meson-private meson-logs meson-info compile_commands.json diff --git a/configure b/configure index 6516ec243c..c8b32e7277 100755 --- a/configure +++ b/configure @@ -3665,9 +3665,6 @@ fi # so the build tree will be missing the link back to the new file, and # tests might fail. Prefer to keep the relevant files in their own # directory and symlink the directory instead. -# UNLINK is used to remove symlinks from older development versions -# that might get into the way when doing "git update" without doing -# a "make distclean" in between. LINKS=3D"Makefile" LINKS=3D"$LINKS tests/tcg/Makefile.target" LINKS=3D"$LINKS pc-bios/optionrom/Makefile" @@ -3679,7 +3676,6 @@ LINKS=3D"$LINKS tests/avocado tests/data" LINKS=3D"$LINKS tests/qemu-iotests/check" LINKS=3D"$LINKS python" LINKS=3D"$LINKS contrib/plugins/Makefile " -UNLINK=3D"pc-bios/keymaps" for bios_file in \ $source_path/pc-bios/*.bin \ $source_path/pc-bios/*.elf \ @@ -3701,11 +3697,6 @@ for f in $LINKS ; do symlink "$source_path/$f" "$f" fi done -for f in $UNLINK ; do - if [ -L "$f" ]; then - rm -f "$f" - fi -done =20 (for i in $cross_cc_vars; do export $i --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640261011836666.7448277497278; Thu, 23 Dec 2021 04:03:31 -0800 (PST) Received: from localhost ([::1]:39090 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mok-0008MQ-Nq for importer@patchew.org; Thu, 23 Dec 2021 07:03:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58952) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdO-0004JZ-J5 for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: from [2a00:1450:4864:20::42d] (port=43934 helo=mail-wr1-x42d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdK-0008Po-A1 for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:46 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v11so10923064wrw.10 for ; Thu, 23 Dec 2021 03:51:41 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:40 -0800 (PST) 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=iAU1ngD4aYy4uaSpPfG3FjFmheg2vIvaOe2PUU21OPw=; b=kuk9LX/miNNOhPtQRj8sOGthofaxdPosRvliA8I7j9/na9+bNfTKNSXP2fzfxo5hX8 /NSWy/ju34N0ZUyn9Gzh/4Zbpd6Vn0JoDqcOfvy1j6aXbpuOdCSN/DYCXZbs5/+CAeZm tVk6ON72qlI9tIb8bik+N61hMOZpvjyuOezBY8RQkITGpgzcFaX5C50am5h64lPZrt00 lBk5VSX2h2DLJXOt29gDsjR5eWyjhAtemVcwhGv3hMju7hkHV5wYV+AY6QbcrXXcRcyR 1nfPq+qyK3ftvGxTYp8fyJH5u2iyh/rBVWtkTjfWJgzUhBbMS75HOw0VcFoaj7FibV+z gVLg== 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=iAU1ngD4aYy4uaSpPfG3FjFmheg2vIvaOe2PUU21OPw=; b=3TVm12S6gNIN15jpBY/cCZZJWKqlIDollXSUZN2ZGQx/XFoY1+uUipSyMrGDTruFv+ ypjOdbORYEqme9NuDL20fgzDKlZZnTi9C2gzyIHCbzrTHDgwo143+dCqERPuvTXenMZ8 Hkw/h2low0zTndQ5AOBt7745sdihVTOv9CUEC3t3P2Jar7XwQGXuiuTKXCj5U8IWZCP4 8rDNlY4FhsTJmDSwlKV+OIh6S4BVkRf3K/bA+CdftQ0dyv1ikPHdPW3N1h7cwp6hW5b8 Rld0Ds2jPjxww3jBef86h/P+Uo9V6cNAzhlo/k1J2Je3mqnAya7/r9dYsLwtnkvItTsr IHYQ== X-Gm-Message-State: AOAM5307J0x0KYMh0QXJaZ5teBoIyMvWpmLeuKe6IZ05pyvEtS0T3QxW 4+sCde958uiPcqBPIIXD/52Tsc8tpkk= X-Google-Smtp-Source: ABdhPJyakzrVTVjH2PQBdDO+VRFGLIKCAzyFkPLVfs+n0FrSPmj2v70wKjegDo6ayvUleRgd5OdBng== X-Received: by 2002:a5d:64a7:: with SMTP id m7mr1465474wrp.687.1640260301177; Thu, 23 Dec 2021 03:51:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/15] configure: parse --enable/--disable-strip automatically, flip default Date: Thu, 23 Dec 2021 12:51:28 +0100 Message-Id: <20211223115134.579235-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42d (failed) 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::42d; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42d.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: 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: 1640261013988100001 Content-Type: text/plain; charset="utf-8" Always include the STRIP variable in config-host.mak (it's only used by the s390-ccw firmware build, and it adds a default if configure omitted it), and use meson-buildoptions.sh to turn --enable/--disable-strip into -Dstrip. The default is now not to strip the binaries like for almost every other package that has a configure script. Signed-off-by: Paolo Bonzini --- configure | 10 +--------- pc-bios/s390-ccw/Makefile | 2 -- scripts/meson-buildoptions.py | 21 ++++++++++++++------- scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure b/configure index c8b32e7277..302d58102b 100755 --- a/configure +++ b/configure @@ -307,7 +307,6 @@ debug=3D"no" sanitizers=3D"no" tsan=3D"no" fortify_source=3D"$default_feature" -strip_opt=3D"yes" mingw32=3D"no" gcov=3D"no" EXESUF=3D"" @@ -890,7 +889,6 @@ for opt do debug_tcg=3D"yes" debug_mutex=3D"yes" debug=3D"yes" - strip_opt=3D"no" fortify_source=3D"no" ;; --enable-sanitizers) sanitizers=3D"yes" @@ -901,8 +899,6 @@ for opt do ;; --disable-tsan) tsan=3D"no" ;; - --disable-strip) strip_opt=3D"no" - ;; --disable-slirp) slirp=3D"disabled" ;; --enable-slirp) slirp=3D"enabled" @@ -1365,7 +1361,6 @@ Advanced options (experts only): --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers --enable-tsan enable thread sanitizer - --disable-strip disable stripping binaries --disable-werror disable compilation abort on warning --disable-stack-protector disable compiler-provided stack protection --audio-drv-list=3DLIST set audio drivers to try if -audiodev is not = used @@ -3312,9 +3307,6 @@ echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action"= >> $config_host_mak if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi -if test "$strip_opt" =3D "yes" ; then - echo "STRIP=3D${strip}" >> $config_host_mak -fi if test "$mingw32" =3D "yes" ; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak if test "$guest_agent_with_vss" =3D "yes" ; then @@ -3591,6 +3583,7 @@ echo "GLIB_CFLAGS=3D$glib_cflags" >> $config_host_mak echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak +echo "STRIP=3D$strip" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak echo "LIBS_QGA=3D$libs_qga" >> $config_host_mak =20 @@ -3805,7 +3798,6 @@ if test "$skip_meson" =3D no; then -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ - -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Db_lto=3D$lto -Dcfi=3D$cfi -Dtcg=3D$tcg -Dxen=3D$xen \ diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index cee9d2c63b..0eb68efc7b 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -44,8 +44,6 @@ build-all: s390-ccw.img s390-netboot.img s390-ccw.elf: $(OBJECTS) $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_= DIR)$@") =20 -STRIP ?=3D strip - s390-ccw.img: s390-ccw.elf $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET= _DIR)$@") =20 diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 96969d89ee..98ae944148 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -36,6 +36,10 @@ "trace_file", } =20 +BUILTIN_OPTIONS =3D { + "strip", +} + LINE_WIDTH =3D 76 =20 =20 @@ -90,14 +94,17 @@ def allow_arg(opt): return not (set(opt["choices"]) <=3D {"auto", "disabled", "enabled"}) =20 =20 +def filter_options(json): + if ":" in json["name"]: + return False + if json["section"] =3D=3D "user": + return json["name"] not in SKIP_OPTIONS + else: + return json["name"] in BUILTIN_OPTIONS + + def load_options(json): - json =3D [ - x - for x in json - if x["section"] =3D=3D "user" - and ":" not in x["name"] - and x["name"] not in SKIP_OPTIONS - ] + json =3D [x for x in json if filter_options(x)] return sorted(json, key=3Dlambda x: x["name"]) =20 =20 diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index ae8f18edc2..46360e541d 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -13,6 +13,7 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-slirp[=3DCHOICE] Whether and how to find the = slirp library' printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' + printf "%s\n" ' --enable-strip Strip targets on install' printf "%s\n" ' --enable-tcg-interpreter TCG with bytecode interpreter = (slow)' printf "%s\n" ' --enable-trace-backends=3DCHOICE' printf "%s\n" ' Set available tracing backends= [log] (choices:' @@ -234,6 +235,8 @@ _meson_option_parse() { --disable-spice) printf "%s" -Dspice=3Ddisabled ;; --enable-spice-protocol) printf "%s" -Dspice_protocol=3Denabled ;; --disable-spice-protocol) printf "%s" -Dspice_protocol=3Ddisabled ;; + --enable-strip) printf "%s" -Dstrip=3Dtrue ;; + --disable-strip) printf "%s" -Dstrip=3Dfalse ;; --enable-tcg) printf "%s" -Dtcg=3Denabled ;; --disable-tcg) printf "%s" -Dtcg=3Ddisabled ;; --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dtrue ;; --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640261013944548.7850255667477; Thu, 23 Dec 2021 04:03:33 -0800 (PST) Received: from localhost ([::1]:39194 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mon-0008R0-0R for importer@patchew.org; Thu, 23 Dec 2021 07:03:33 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdO-0004Jb-Kx for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: from [2a00:1450:4864:20::42f] (port=43936 helo=mail-wr1-x42f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdL-0008Q3-TR for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:46 -0500 Received: by mail-wr1-x42f.google.com with SMTP id v11so10923099wrw.10 for ; Thu, 23 Dec 2021 03:51:42 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:41 -0800 (PST) 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=e1urq3/NH1DhV4VQiTljtVXGI+TxRV769wqtxpZBiJE=; b=PagxT/JDmSY4hHWAO9RNDgyHX7l8iVUTXjbXoXpYw6Obl0zpcQQ3wyAXU+EoZH4WqE WN607ztZCJJnSgKFN4DZQsmRG9+BMoLFToozG2E/IOYVS4pPBEieUtzzDq1F5pO9fUiA uz/ta8JjzNyyA3YTkxGUoyYxnxetqHTpCSi7XN39GjGDFpRvtG6y+TMBjcSAYS7THBxr uywsMOweBWOHSvO5mNFkEWWmRPFcZwrs+M/UhM8pypFFyE9GnwRoqn1+v8IiDBttVrZf HDR90MDxehmfukNfFku/k2VtQuNMGoSFD7HGsgKaWB/SzQKN79yGuP9phB0wJ4N/pSGr SKEA== 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=e1urq3/NH1DhV4VQiTljtVXGI+TxRV769wqtxpZBiJE=; b=5VAG4rMno9YM5aTkmfcOmimy8uXpIKQuDftyhZWWIYl9B8dHUI2nqdnCUYLUJAxzS7 aRGMmsEj/A7bN0QzKjA1BeCgWwAa+PKNl5T9/gHtNloJ/zi+eAtjqW92iXhKNq+te92g uYUGr3T+q0KhSPTro3fU9O8TmRwV7Nb9j2ilbK2Pz28TpSl0wdCQQ4CD5Y5goAbQlTSc gjIYtZtlUnMzCylU/lgDEytNDFLzqbE9yUE2xoOWJ+InXZITipcq6WHX8iShZ4PLZxsB yVdTig/YP6SCiVxbnQqC9DZi/oXgQcibhDTeYfwbxCf3pYeyW6+A+uziOO4NNXmue7N2 QvJA== X-Gm-Message-State: AOAM532cSjf/+epcuATF8yJ05Oa3OB3Tymzw7qFLp0XOqB+H7bh1YCfx cVS5tIA6Z8de24RX90nGxfk/8UCjZ0o= X-Google-Smtp-Source: ABdhPJyNXFCckWTNwvZHfaz+iiXar6WBsmsX/OuHO/6MweKKAudJAnGd287JJVlp206q4Z+/+c/WJw== X-Received: by 2002:a05:6000:1886:: with SMTP id a6mr1545762wri.614.1640260301709; Thu, 23 Dec 2021 03:51:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/15] configure: move non-command-line variables away from command-line parsing section Date: Thu, 23 Dec 2021 12:51:29 +0100 Message-Id: <20211223115134.579235-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42f (failed) 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::42f; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=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: 1640261014979100003 This makes it easier to identify candidates for moving to Meson. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 302d58102b..8eb8e4c2cc 100755 --- a/configure +++ b/configure @@ -307,16 +307,12 @@ debug=3D"no" sanitizers=3D"no" tsan=3D"no" fortify_source=3D"$default_feature" -mingw32=3D"no" gcov=3D"no" EXESUF=3D"" modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" qemu_suffix=3D"qemu" -bsd=3D"no" -linux=3D"no" -solaris=3D"no" profiler=3D"no" softmmu=3D"yes" linux_user=3D"" @@ -330,8 +326,6 @@ opengl=3D"$default_feature" cpuid_h=3D"no" avx2_opt=3D"$default_feature" guest_agent=3D"$default_feature" -guest_agent_with_vss=3D"no" -guest_agent_ntddscsi=3D"no" vss_win32_sdk=3D"$default_feature" win_sdk=3D"no" want_tools=3D"$default_feature" @@ -526,6 +520,10 @@ fi =20 # OS specific =20 +mingw32=3D"no" +bsd=3D"no" +linux=3D"no" +solaris=3D"no" case $targetos in windows) mingw32=3D"yes" @@ -2546,6 +2544,7 @@ fi ########################################## # check if we have VSS SDK headers for win =20 +guest_agent_with_vss=3D"no" if test "$mingw32" =3D "yes" && test "$guest_agent" !=3D "no" && \ test "$vss_win32_sdk" !=3D "no" ; then case "$vss_win32_sdk" in @@ -2576,7 +2575,6 @@ EOF echo "ERROR: The headers are extracted in the directory \`inc'." feature_not_found "VSS support" fi - guest_agent_with_vss=3D"no" fi fi =20 @@ -2603,6 +2601,7 @@ fi =20 ########################################## # check if mingw environment provides a recent ntddscsi.h +guest_agent_ntddscsi=3D"no" if test "$mingw32" =3D "yes" && test "$guest_agent" !=3D "no"; then cat > $TMPC << EOF #include --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640261244413853.3051764319789; Thu, 23 Dec 2021 04:07:24 -0800 (PST) Received: from localhost ([::1]:47432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MsV-0005kx-BP for importer@patchew.org; Thu, 23 Dec 2021 07:07:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdP-0004Kg-VM for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: from [2a00:1450:4864:20::434] (port=37411 helo=mail-wr1-x434.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0008QF-4Y for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: by mail-wr1-x434.google.com with SMTP id t26so10947886wrb.4 for ; Thu, 23 Dec 2021 03:51:43 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:41 -0800 (PST) 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=3qbqkIQNqeg3P7tq5zzTnKQjNiTPg4hX+5Vl379ivaM=; b=N/DORDta1Wp6aIYLa1EAHa0g7+AYAWqTqjrhcUocSbXBsJMm4mbu1c9U7bMnGZnp8Q ItczBivZHFH5w3oiQO+AzZDTmcQQ/vLbWms+6JY1sRN8QIB1rvoXR71nWCQr6fTHisBx qswkH5Jed79XgOtn+JTD5Wbv/ZZe7FuU0ZstLLG0+hyGiU7JiqJeK+RmcAIg86/Skk1c kZJI27otxpy1B7kojE6Vm8onV4I1ayHRbK5g1XzIZpocVW6cORJt/7xopWPvk7iGhvid U6HZZM0GLdguwbOEp4942CuoquYLjH9vh1gndFDfc4E1gmxTMlMdVmFRkMY+LXTFcY27 IL1Q== 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=3qbqkIQNqeg3P7tq5zzTnKQjNiTPg4hX+5Vl379ivaM=; b=oxTteVB3aYq2vHwF0DLbxlUl+8nPhI0wonXJW5TgtHKfMoI/7WxsdNodUlr72orLVn O8DvDP05qY6hwQ87NNCJCIgaYyJp/FyzMNQ6YF0EJIJyYqQ2Ofp2pK73/DQvNTrPxJpU rDi8TorMq4U+VX/XKWFWhA4TLXbKjXnqU8l9bhKRa6lDiVQw+iHuG9xMDGiihqzfpFTq EIBLIuYTFjLnbjsXBYRocZBmho75bOxXZn6qoixM6ibHS5g9MdSXmMC7eMx9cf/GOYtq 4Ey/3BDC3tK9HgLCe6FeRGT4xuex2fHU5ENRbFTebKIGds82ndNTK560Ct74YY7P9qbW 0ZcQ== X-Gm-Message-State: AOAM530siTEn0XTzPVn8IRYVsLXFLTb31xkG8SLL0819/uBy4c4S9bQ2 XBXPg/pL3/5mJMZ1BteVu9BGy4LbjZA= X-Google-Smtp-Source: ABdhPJxLOhv3S3SZM8Gy0WmXJ/aC3yxN6c1tCJmAXNBNPLubRtNJGJ7bU+ZhM7PJ3vL2vRibtLwbkA== X-Received: by 2002:a5d:6111:: with SMTP id v17mr1513958wrt.324.1640260302239; Thu, 23 Dec 2021 03:51:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/15] meson: build contrib/ executables after generated headers Date: Thu, 23 Dec 2021 12:51:30 +0100 Message-Id: <20211223115134.579235-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::434 (failed) 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::434; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x434.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=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: 1640261244968100001 This will be needed as soon as config-poison.h moves from configure to a meson custom_target (which is built at "ninja" time). Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- contrib/elf2dmp/meson.build | 2 +- contrib/ivshmem-client/meson.build | 2 +- contrib/ivshmem-server/meson.build | 2 +- contrib/rdmacm-mux/meson.build | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/elf2dmp/meson.build b/contrib/elf2dmp/meson.build index 4d86cb390a..6707d43c4f 100644 --- a/contrib/elf2dmp/meson.build +++ b/contrib/elf2dmp/meson.build @@ -1,5 +1,5 @@ if curl.found() - executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.= c', 'qemu_elf.c'), + executable('elf2dmp', files('main.c', 'addrspace.c', 'download.c', 'pdb.= c', 'qemu_elf.c'), genh, dependencies: [glib, curl], install: true) endif diff --git a/contrib/ivshmem-client/meson.build b/contrib/ivshmem-client/me= son.build index 1b171efb4f..ce8dcca84d 100644 --- a/contrib/ivshmem-client/meson.build +++ b/contrib/ivshmem-client/meson.build @@ -1,4 +1,4 @@ -executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), +executable('ivshmem-client', files('ivshmem-client.c', 'main.c'), genh, dependencies: glib, build_by_default: targetos =3D=3D 'linux', install: false) diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/me= son.build index 3a53942201..c6c3c82e89 100644 --- a/contrib/ivshmem-server/meson.build +++ b/contrib/ivshmem-server/meson.build @@ -1,4 +1,4 @@ -executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), +executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), genh, dependencies: [qemuutil, rt], build_by_default: targetos =3D=3D 'linux', install: false) diff --git a/contrib/rdmacm-mux/meson.build b/contrib/rdmacm-mux/meson.build index 6cc5016747..7674f54cc5 100644 --- a/contrib/rdmacm-mux/meson.build +++ b/contrib/rdmacm-mux/meson.build @@ -2,7 +2,7 @@ if 'CONFIG_PVRDMA' in config_host # if not found, CONFIG_PVRDMA should not be set # FIXME: broken on big endian architectures libumad =3D cc.find_library('ibumad', required: true) - executable('rdmacm-mux', files('main.c'), + executable('rdmacm-mux', files('main.c'), genh, dependencies: [glib, libumad], build_by_default: false, install: false) --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640261248226270.10050577952757; Thu, 23 Dec 2021 04:07:28 -0800 (PST) Received: from localhost ([::1]:47586 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MsZ-0005rY-7y for importer@patchew.org; Thu, 23 Dec 2021 07:07:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59012) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdQ-0004L0-6P for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:48 -0500 Received: from [2a00:1450:4864:20::433] (port=46963 helo=mail-wr1-x433.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0008QL-5d for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: by mail-wr1-x433.google.com with SMTP id i22so10869276wrb.13 for ; Thu, 23 Dec 2021 03:51:43 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:42 -0800 (PST) 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=lCTmqeld7Cn0/DS9onYUMtselzlMQj/7lzl64QKsiJE=; b=WtgejeNoXGKdyYlMqsrHa9BU1Tf0fabXqguugwurDGbskihm2XTeHayCYbK71UGqw3 ZAHfKcDu0NBFFvHvSA//sTYqjtWq5xaJtISoVcWqnKB6bNSwDUAK1nCaUg2lnZ3b7VTX XHgvBGsWaqmKCde5vpeivCjjjoX3vAXQFxxVBwYGdUqv6zJH5VDoqleVHSm0lvOFsZ02 8Z0CGKZ3VyySCUOYvsxFJDITz6JUea+oD2fHbYXtA3Zj6in8KYks3XCw9rsBscXimqpr 9T2gF9CRs/gAkGuQudkKmKT3s+RO7Vw6G5GlwpcfovipZPLBbsrqddZTjvlZpJ0eVbl3 qIOQ== 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=lCTmqeld7Cn0/DS9onYUMtselzlMQj/7lzl64QKsiJE=; b=lh0dVG1vU6VEtFccMniS7jhcXgUZYScGXe6dqbuzGk1NxJRbJDmvGhu1SHOE7j3Ix3 r5TV+vXsoJZ/vX9Cmp2Utbwwy/8RdFOYqtROrvGMVEA7tffXn4vhrvO4j7VgRVzIT+na Feo6rDnKUQXWAyM+DxPLblKIw9szRicrYscASQelJ8p2DRXroWKFeZAAwujvESEpnOAe X9FOBflWrehL0+oNsF5TbAxniwsU38n6QGvR2wR0S9L0Qq0UgK/do7ws+2l50RD11BUL i/Y8ZXxp5gSLHQZ+Q8F+EFaHM7lfz4/4hH73B8xCCn/xWRPY9VFJT8tLOMncFsQpL5+x 8/FQ== X-Gm-Message-State: AOAM531/eZmNKjEpR9FnaGr+HnL7TP4Mft91InlSYi4Aa8Kqp12U3mJs hptuzNuvtJlVkNkTCmUEBegaAZq70Ko= X-Google-Smtp-Source: ABdhPJzJrmkNayjA+tjTpVHEmSddxqrCstQq3rX+M4QQIhOtCTsuvQ62FI8+uJOaiZ4by+jfZCGHtQ== X-Received: by 2002:a5d:4e92:: with SMTP id e18mr1547027wru.89.1640260302821; Thu, 23 Dec 2021 03:51:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/15] configure, meson: move config-poison.h to meson Date: Thu, 23 Dec 2021 12:51:31 +0100 Message-Id: <20211223115134.579235-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::433 (failed) 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::433; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x433.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: 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: 1640261249689100001 Content-Type: text/plain; charset="utf-8" This ensures that the file is regenerated properly whenever config-target.h or config-devices.h files change. Signed-off-by: Paolo Bonzini --- Makefile | 2 +- configure | 11 ----------- meson.build | 12 ++++++++++++ scripts/make-config-poison.sh | 16 ++++++++++++++++ 4 files changed, 29 insertions(+), 12 deletions(-) create mode 100755 scripts/make-config-poison.sh diff --git a/Makefile b/Makefile index 06ad8a61e1..2f80f56a4a 100644 --- a/Makefile +++ b/Makefile @@ -220,7 +220,7 @@ qemu-%.tar.bz2: =20 distclean: clean -$(quiet-@)test -f build.ninja && $(NINJA) $(NINJAFLAGS) -t clean -g || : - rm -f config-host.mak config-poison.h + rm -f config-host.mak rm -f tests/tcg/config-*.mak rm -f config.status rm -f roms/seabios/config.mak diff --git a/configure b/configure index 8eb8e4c2cc..d2f12bc2d6 100755 --- a/configure +++ b/configure @@ -3827,17 +3827,6 @@ if test -n "${deprecated_features}"; then echo " features: ${deprecated_features}" fi =20 -# Create list of config switches that should be poisoned in common code... -# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. -target_configs_h=3D$(ls *-config-devices.h *-config-target.h 2>/dev/null) -if test -n "$target_configs_h" ; then - sed -n -e '/CONFIG_TCG/d' -e '/CONFIG_USER_ONLY/d' \ - -e '/^#define / { s///; s/ .*//; s/^/#pragma GCC poison /p; }' \ - $target_configs_h | sort -u > config-poison.h -else - :> config-poison.h -fi - # Save the configure command line for later reuse. cat <config.status #!/bin/sh diff --git a/meson.build b/meson.build index 993a591983..a61eb7cee5 100644 --- a/meson.build +++ b/meson.build @@ -2006,6 +2006,18 @@ config_all +=3D { 'CONFIG_ALL': true, } =20 +target_configs_h =3D [] +foreach target: target_dirs + target_configs_h +=3D config_target_h[target] + target_configs_h +=3D config_devices_h.get(target, []) +endforeach +genh +=3D custom_target('config-poison.h', + input: [target_configs_h], + output: 'config-poison.h', + capture: true, + command: [find_program('scripts/make-config-poison.s= h'), + target_configs_h]) + ############## # Submodules # ############## diff --git a/scripts/make-config-poison.sh b/scripts/make-config-poison.sh new file mode 100755 index 0000000000..d222a04304 --- /dev/null +++ b/scripts/make-config-poison.sh @@ -0,0 +1,16 @@ +#! /bin/sh + +if test $# =3D 0; then + exit 0 +fi + +# Create list of config switches that should be poisoned in common code... +# but filter out CONFIG_TCG and CONFIG_USER_ONLY which are special. +exec sed -n \ + -e' /CONFIG_TCG/d' \ + -e '/CONFIG_USER_ONLY/d' \ + -e '/^#define / {' \ + -e 's///' \ + -e 's/ .*//' \ + -e 's/^/#pragma GCC poison /p' \ + -e '}' "$@" --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640261556259162.16239724889112; Thu, 23 Dec 2021 04:12:36 -0800 (PST) Received: from localhost ([::1]:55720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MxX-0003vc-24 for importer@patchew.org; Thu, 23 Dec 2021 07:12:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdQ-0004Kj-0k for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:48 -0500 Received: from [2a00:1450:4864:20::42c] (port=36421 helo=mail-wr1-x42c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0008QP-5N for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: by mail-wr1-x42c.google.com with SMTP id r17so10965937wrc.3 for ; Thu, 23 Dec 2021 03:51:44 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:43 -0800 (PST) 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=/yoSotUhPZRyouKzfRrZfly5S4178QI/W+Dp24FNbbA=; b=qFj/3cOXxh4EA0EfcNVVlEYaneTWizQ4OT//NuUEBiUPkW3BdOpTUcRI7dEk42r+mR 46M/mMj0ksls0TKju6b9qywP0LokQzh4GWFnmCuqqKfu3sC1+n3D+lPBWA/gDl0boAS3 yyplv/LypuHlle6zdTMUHoVBAinsqsve67lbNCgBPR+6xN7jn4tG2w2ww9Y9nrnSL6W8 XzMO0DIO9vVenKZgXGnRHQtBPBjmVk64clBM7CQfv8hAmN6eM6m6ZqGnhrMlGx/RpDQn NIOMqlcrO0nfyg+jXm2P6ij+/IqIJzipiOkcc0VvhV5KT2AlxJHnslxYndQ7JMHD7BsS uExw== 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=/yoSotUhPZRyouKzfRrZfly5S4178QI/W+Dp24FNbbA=; b=TaiDcTDV9xTF4YiBkTamE1PjhdUc7YVCGf28I3V9lNCmq2NguMKXFUx9wS6fyAz7/0 NxXdQwynKmyLTEDu07FUj/DHl5/u0hUl3li4Vx3g88ptgsdjfagX325frG0wbCxVN9fD 6mSeNDP+X/IdAJBkWEkPgJQBJ816eh9ZYzlRY2jhx0bdPNLpLGgXANFxsCtHghwb9Dnr mtVWhWLdlWvnie1B+Ca43v43jUsKJ0GqzVePEt5pR5lgZnW5vrr1HeftnIkDVqgzmKlI Hv/JkPichFmExH2IxU4c6uZNtVnJDVjb5oGrJfHJgTxo8MO1dGNMmX6PfVNImmH5wS+0 IJbg== X-Gm-Message-State: AOAM53235dRmluiIe5eLEaZ0djSK5p/m4d7mdsVHOjZPuDV2/s2MsT0p 8Ztyn2pPmhvBDI1hS9mbD2M2E6k9hAw= X-Google-Smtp-Source: ABdhPJz6rTvlBWSx2VdBuKa239LSYPog0tWPD1GhX4LsX/vLs35ikAx76YL7INc6nIQSrPp4L9KllQ== X-Received: by 2002:a05:6000:1567:: with SMTP id 7mr1531752wrz.513.1640260303431; Thu, 23 Dec 2021 03:51:43 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/15] meson: add comments in the target-specific flags section Date: Thu, 23 Dec 2021 12:51:32 +0100 Message-Id: <20211223115134.579235-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42c (failed) 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::42c; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x42c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: 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: 1640261557482100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- meson.build | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meson.build b/meson.build index a61eb7cee5..3519ed51e3 100644 --- a/meson.build +++ b/meson.build @@ -233,6 +233,7 @@ endif # Target-specific checks and dependencies # ########################################### =20 +# Fuzzing if get_option('fuzzing') and get_option('fuzzing_engine') =3D=3D '' and \ not cc.links(''' #include @@ -244,6 +245,7 @@ if get_option('fuzzing') and get_option('fuzzing_engine= ') =3D=3D '' and \ error('Your compiler does not support -fsanitize=3Dfuzzer') endif =20 +# Tracing backends if 'ftrace' in get_option('trace_backends') and targetos !=3D 'linux' error('ftrace is supported only on Linux') endif @@ -257,6 +259,7 @@ if 'syslog' in get_option('trace_backends') and not cc.= compiles(''' error('syslog is not supported on this system') endif =20 +# Miscellaneous Linux-only features if targetos !=3D 'linux' and get_option('mpath').enabled() error('Multipath is supported only on Linux') endif @@ -266,6 +269,7 @@ if targetos !=3D 'linux' and get_option('multiprocess')= .enabled() endif multiprocess_allowed =3D targetos =3D=3D 'linux' and not get_option('multi= process').disabled() =20 +# Target-specific libraries and flags libm =3D cc.find_library('m', required: false) threads =3D dependency('threads') util =3D cc.find_library('util', required: false) @@ -306,6 +310,7 @@ elif targetos =3D=3D 'openbsd' endif endif =20 +# Target-specific configuration of accelerators accelerators =3D [] if not get_option('kvm').disabled() and targetos =3D=3D 'linux' accelerators +=3D 'CONFIG_KVM' --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260421089943.746553922962; Thu, 23 Dec 2021 03:53:41 -0800 (PST) Received: from localhost ([::1]:41482 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0MfE-00078C-6O for importer@patchew.org; Thu, 23 Dec 2021 06:53:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59016) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdQ-0004LR-9y for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:48 -0500 Received: from [2a00:1450:4864:20::430] (port=44927 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0008QV-E9 for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: by mail-wr1-x430.google.com with SMTP id t18so10895983wrg.11 for ; Thu, 23 Dec 2021 03:51:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:43 -0800 (PST) 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=uRrDZ9kqjrjMD+Elsmgxx2oG4MDa0ekRmY7IWCopn00=; b=nPws+ygo6Br1LV5Vzib1DQiJn/vf99M8ECuGzBwSuluHdPd1HG2xw5eea3JnCiuJPN gamfO3miEApsUmjWAHrJHhwKwzt8eJwlRf9KK81SzKxg6jIIwB3e3XcNIBPnAIkZa31a PvIiVpBhFL3ovrAzSpA6xVXf9errqhDENwF3qAMtdfXbsQ/WXqjQKAU0lt/IucBwrb0j dqG/GUjFsLJ3UZdQKyVC40RBgmiux+S0U3Mms7FxXKBt6ecpU7Z2m1iDKEFrnbKB0RfT vrX+wqVVnMuuR1YyBGbnCCXj1RcMkRG3+6VrQxa+IaHysnUvbDeFm/APUnNfLbqsfJbG C6oA== 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=uRrDZ9kqjrjMD+Elsmgxx2oG4MDa0ekRmY7IWCopn00=; b=RORivFNnhhslh4n4zWXY4wJFj3LAcw5leoELtO/g7U4LVELDyawOLRMKNd5pyQnQH8 9Ps0AfHK9a5fTnhNbYfYI1Zzek0U4uDOlUbPd89yJlldXAHgKHDkxn6epXwfa5jqMlzp 0BzIQ4a5Y/uc1Am9cGUBJdVYnt9buiPycrjbU6q9gOwt+pFnWscDgNizC9Yi2aOLNMS0 NXPI2QuBx0GTxnlwi2i2M+wxGdSdq4IdlPa1vt4M0MRoSBududV2sYWAVKkE/c6NyAn1 avloQoo4UK6ASeZJlRn3N8vVPtQGkQYTyGVd/BmogeaQBjTc+hdsBMQiauahrcq2ehss eN9g== X-Gm-Message-State: AOAM531cYNH13TesJUuFOLb3s2pTeKUiiYF9/RvCD8GEDq4ZucF0UsSB +B2J0h0KZOzO1cVtsT40Rj1vP/tgKlk= X-Google-Smtp-Source: ABdhPJx0W7aZW+3z5WwTIIYglwx3u78VJa5WsjcQt1jD1BDbFc4zBvT9IEtDlcZJOD+6bHlJUOCSCA== X-Received: by 2002:a05:6000:a:: with SMTP id h10mr1579484wrx.253.1640260304073; Thu, 23 Dec 2021 03:51:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/15] KVM: use KVM_{GET|SET}_SREGS2 when supported. Date: Thu, 23 Dec 2021 12:51:33 +0100 Message-Id: <20211223115134.579235-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) 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::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Levitsky 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: 1640260421621100001 Content-Type: text/plain; charset="utf-8" From: Maxim Levitsky This allows to make PDPTRs part of the migration stream and thus not reload them after migration which is against X86 spec. Signed-off-by: Maxim Levitsky Message-Id: <20211101132300.192584-2-mlevitsk@redhat.com> Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 3 ++ target/i386/kvm/kvm.c | 108 +++++++++++++++++++++++++++++++++++++++++- target/i386/machine.c | 29 ++++++++++++ 3 files changed, 138 insertions(+), 2 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 04f2b790c9..9911d7c871 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1455,6 +1455,9 @@ typedef struct CPUX86State { SegmentCache idt; /* only base and limit are used */ =20 target_ulong cr[5]; /* NOTE: cr1 is unused */ + + bool pdptrs_valid; + uint64_t pdptrs[4]; int32_t a20_mask; =20 BNDReg bnd_regs[4]; diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 13f8e30c2a..d81745620b 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -124,6 +124,7 @@ static uint32_t num_architectural_pmu_fixed_counters; static int has_xsave; static int has_xcrs; static int has_pit_state2; +static int has_sregs2; static int has_exception_payload; =20 static bool has_msr_mcg_ext_ctl; @@ -2324,6 +2325,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s) has_xsave =3D kvm_check_extension(s, KVM_CAP_XSAVE); has_xcrs =3D kvm_check_extension(s, KVM_CAP_XCRS); has_pit_state2 =3D kvm_check_extension(s, KVM_CAP_PIT_STATE2); + has_sregs2 =3D kvm_check_extension(s, KVM_CAP_SREGS2) > 0; =20 hv_vpindex_settable =3D kvm_check_extension(s, KVM_CAP_HYPERV_VP_INDEX= ); =20 @@ -2650,6 +2652,61 @@ static int kvm_put_sregs(X86CPU *cpu) return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS, &sregs); } =20 +static int kvm_put_sregs2(X86CPU *cpu) +{ + CPUX86State *env =3D &cpu->env; + struct kvm_sregs2 sregs; + int i; + + sregs.flags =3D 0; + + if ((env->eflags & VM_MASK)) { + set_v8086_seg(&sregs.cs, &env->segs[R_CS]); + set_v8086_seg(&sregs.ds, &env->segs[R_DS]); + set_v8086_seg(&sregs.es, &env->segs[R_ES]); + set_v8086_seg(&sregs.fs, &env->segs[R_FS]); + set_v8086_seg(&sregs.gs, &env->segs[R_GS]); + set_v8086_seg(&sregs.ss, &env->segs[R_SS]); + } else { + set_seg(&sregs.cs, &env->segs[R_CS]); + set_seg(&sregs.ds, &env->segs[R_DS]); + set_seg(&sregs.es, &env->segs[R_ES]); + set_seg(&sregs.fs, &env->segs[R_FS]); + set_seg(&sregs.gs, &env->segs[R_GS]); + set_seg(&sregs.ss, &env->segs[R_SS]); + } + + set_seg(&sregs.tr, &env->tr); + set_seg(&sregs.ldt, &env->ldt); + + sregs.idt.limit =3D env->idt.limit; + sregs.idt.base =3D env->idt.base; + memset(sregs.idt.padding, 0, sizeof sregs.idt.padding); + sregs.gdt.limit =3D env->gdt.limit; + sregs.gdt.base =3D env->gdt.base; + memset(sregs.gdt.padding, 0, sizeof sregs.gdt.padding); + + sregs.cr0 =3D env->cr[0]; + sregs.cr2 =3D env->cr[2]; + sregs.cr3 =3D env->cr[3]; + sregs.cr4 =3D env->cr[4]; + + sregs.cr8 =3D cpu_get_apic_tpr(cpu->apic_state); + sregs.apic_base =3D cpu_get_apic_base(cpu->apic_state); + + sregs.efer =3D env->efer; + + if (env->pdptrs_valid) { + for (i =3D 0; i < 4; i++) { + sregs.pdptrs[i] =3D env->pdptrs[i]; + } + sregs.flags |=3D KVM_SREGS2_FLAGS_PDPTRS_VALID; + } + + return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_SREGS2, &sregs); +} + + static void kvm_msr_buf_reset(X86CPU *cpu) { memset(cpu->kvm_msr_buf, 0, MSR_BUF_SIZE); @@ -3330,6 +3387,53 @@ static int kvm_get_sregs(X86CPU *cpu) return 0; } =20 +static int kvm_get_sregs2(X86CPU *cpu) +{ + CPUX86State *env =3D &cpu->env; + struct kvm_sregs2 sregs; + int i, ret; + + ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_GET_SREGS2, &sregs); + if (ret < 0) { + return ret; + } + + get_seg(&env->segs[R_CS], &sregs.cs); + get_seg(&env->segs[R_DS], &sregs.ds); + get_seg(&env->segs[R_ES], &sregs.es); + get_seg(&env->segs[R_FS], &sregs.fs); + get_seg(&env->segs[R_GS], &sregs.gs); + get_seg(&env->segs[R_SS], &sregs.ss); + + get_seg(&env->tr, &sregs.tr); + get_seg(&env->ldt, &sregs.ldt); + + env->idt.limit =3D sregs.idt.limit; + env->idt.base =3D sregs.idt.base; + env->gdt.limit =3D sregs.gdt.limit; + env->gdt.base =3D sregs.gdt.base; + + env->cr[0] =3D sregs.cr0; + env->cr[2] =3D sregs.cr2; + env->cr[3] =3D sregs.cr3; + env->cr[4] =3D sregs.cr4; + + env->efer =3D sregs.efer; + + env->pdptrs_valid =3D sregs.flags & KVM_SREGS2_FLAGS_PDPTRS_VALID; + + if (env->pdptrs_valid) { + for (i =3D 0; i < 4; i++) { + env->pdptrs[i] =3D sregs.pdptrs[i]; + } + } + + /* changes to apic base and cr8/tpr are read back via kvm_arch_post_ru= n */ + x86_update_hflags(env); + + return 0; +} + static int kvm_get_msrs(X86CPU *cpu) { CPUX86State *env =3D &cpu->env; @@ -4173,7 +4277,7 @@ int kvm_arch_put_registers(CPUState *cpu, int level) assert(cpu_is_stopped(cpu) || qemu_cpu_is_self(cpu)); =20 /* must be before kvm_put_nested_state so that EFER.SVME is set */ - ret =3D kvm_put_sregs(x86_cpu); + ret =3D has_sregs2 ? kvm_put_sregs2(x86_cpu) : kvm_put_sregs(x86_cpu); if (ret < 0) { return ret; } @@ -4278,7 +4382,7 @@ int kvm_arch_get_registers(CPUState *cs) if (ret < 0) { goto out; } - ret =3D kvm_get_sregs(cpu); + ret =3D has_sregs2 ? kvm_get_sregs2(cpu) : kvm_get_sregs(cpu); if (ret < 0) { goto out; } diff --git a/target/i386/machine.c b/target/i386/machine.c index 83c2b91529..6202f47793 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -1451,6 +1451,34 @@ static const VMStateDescription vmstate_msr_intel_sg= x =3D { .needed =3D intel_sgx_msrs_needed, .fields =3D (VMStateField[]) { VMSTATE_UINT64_ARRAY(env.msr_ia32_sgxlepubkeyhash, X86CPU, 4), + VMSTATE_END_OF_LIST() + } + }; + +static bool pdptrs_needed(void *opaque) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + return env->pdptrs_valid; +} + +static int pdptrs_post_load(void *opaque, int version_id) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + env->pdptrs_valid =3D true; + return 0; +} + + +static const VMStateDescription vmstate_pdptrs =3D { + .name =3D "cpu/pdptrs", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D pdptrs_needed, + .post_load =3D pdptrs_post_load, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64_ARRAY(env.pdptrs, X86CPU, 4), VMSTATE_END_OF_LIST() } }; @@ -1593,6 +1621,7 @@ const VMStateDescription vmstate_x86_cpu =3D { #endif &vmstate_msr_tsx_ctrl, &vmstate_msr_intel_sgx, + &vmstate_pdptrs, NULL } }; --=20 2.33.1 From nobody Sun May 19 09:42:15 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 1640260571192150.75761940646282; Thu, 23 Dec 2021 03:56:11 -0800 (PST) Received: from localhost ([::1]:50080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n0Mhe-0004NL-4p for importer@patchew.org; Thu, 23 Dec 2021 06:56:10 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n0MdP-0004Kc-Sr for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:48 -0500 Received: from [2a00:1450:4864:20::430] (port=34746 helo=mail-wr1-x430.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n0MdN-0008QY-Uu for qemu-devel@nongnu.org; Thu, 23 Dec 2021 06:51:47 -0500 Received: by mail-wr1-x430.google.com with SMTP id s1so11008924wrg.1 for ; Thu, 23 Dec 2021 03:51:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id o2sm4537106wru.109.2021.12.23.03.51.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Dec 2021 03:51:44 -0800 (PST) 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=o0Zb6eJUXBCzx/VoGiJ7pghz/EEZF15L9m16rQtFb94=; b=WF/PZplkyoJ2bw//E1+Tx0G/PZPshNY7itGKR+TPKJ9tZsoLw3nN88MziLaskQJYyx mHlKvrVLz6kQiLaaAlnWOpJcrtvQkQrdEEDJovBy9YbBj6Yevbxtyr1OFGv4THm437Jt 9ScUTOTkos2/m9Z+CfBJUCuqzjU46DUgoqBTI9F9wvDy0Gs5mqTrmPvYr36vyyvYtdrJ cugPcnt7OmZUzdfuY+w9C/1yhKDfa6bGRzBqWi54zpCcq7BWcYPyhFhXLvXmqgZsESej KBqVtOIUjT6wxwCPBOi/SDPz/sgT5Kzj1pfqfjz7/LHQSdLc+X3sad1AlSlxqskPVB+T 3pqQ== 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=o0Zb6eJUXBCzx/VoGiJ7pghz/EEZF15L9m16rQtFb94=; b=EEeL0UvJqrCdTqC3gwiaqoIze/QY4JFH/aUFXxmuLSgJjE3d5Z80H7Uzb3j6fy3zyG qMT9vAcAuo6BU6Rc2sHfUSNQOp3zC+A8dgzf8OGo5kxTwo1L39uyqCNnsapmuq8Kstd+ JSArHD6u92bMgxQ+ipyfwBIcBVq7vlnxpDirC+E2cZ+q2+Lj430xQU1DeLrd8SlnsQaC 7jP6Tfec6o5Bvh92PkeP2mpubz8QvyXBLz9NbOqGCLL3X57HOepU6iHNov5uBPZRcx1n +9wARfzUeZyhwJhFUG1KA6Pz5SGyzhlhfP/DJIWlFQx2OpCFYlESom68YGzc52n9mYxC KIVw== X-Gm-Message-State: AOAM531EBAIv6Yb9Jh5/LNKCXSOQ6RfsU8mV4fUVdOCO7Ti5fDrkmOVz Dd+v9Vm+WZo1719iU0eLQYR0AHiC85c= X-Google-Smtp-Source: ABdhPJwUDwUx7RQBTJlkE4vHpEY6lLsZpUfZ2UoqBXxuEqc/fL6qBS/JpoKNT4FecJlHiFMak50FmQ== X-Received: by 2002:a5d:6dad:: with SMTP id u13mr1583237wrs.604.1640260304645; Thu, 23 Dec 2021 03:51:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/15] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS Date: Thu, 23 Dec 2021 12:51:34 +0100 Message-Id: <20211223115134.579235-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211223115134.579235-1-pbonzini@redhat.com> References: <20211223115134.579235-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::430 (failed) 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::430; envelope-from=paolo.bonzini@gmail.com; helo=mail-wr1-x430.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.25, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=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: 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: 1640260572333100003 Content-Type: text/plain; charset="utf-8" This is unnecessary, because the interrupt would be retrieved and queued anyway by KVM_GET_VCPU_EVENTS and KVM_SET_VCPU_EVENTS respectively, and it makes the flow more similar to the one for KVM_GET/SET_SREGS2. Signed-off-by: Paolo Bonzini --- target/i386/kvm/kvm.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index d81745620b..2c8feb4a6f 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2607,11 +2607,11 @@ static int kvm_put_sregs(X86CPU *cpu) CPUX86State *env =3D &cpu->env; struct kvm_sregs sregs; =20 + /* + * The interrupt_bitmap is ignored because KVM_SET_SREGS is + * always followed by KVM_SET_VCPU_EVENTS. + */ memset(sregs.interrupt_bitmap, 0, sizeof(sregs.interrupt_bitmap)); - if (env->interrupt_injected >=3D 0) { - sregs.interrupt_bitmap[env->interrupt_injected / 64] |=3D - (uint64_t)1 << (env->interrupt_injected % 64); - } =20 if ((env->eflags & VM_MASK)) { set_v8086_seg(&sregs.cs, &env->segs[R_CS]); @@ -3341,23 +3341,17 @@ static int kvm_get_sregs(X86CPU *cpu) { CPUX86State *env =3D &cpu->env; struct kvm_sregs sregs; - int bit, i, ret; + int ret; =20 ret =3D kvm_vcpu_ioctl(CPU(cpu), KVM_GET_SREGS, &sregs); if (ret < 0) { return ret; } =20 - /* There can only be one pending IRQ set in the bitmap at a time, so t= ry - to find it and save its number instead (-1 for none). */ - env->interrupt_injected =3D -1; - for (i =3D 0; i < ARRAY_SIZE(sregs.interrupt_bitmap); i++) { - if (sregs.interrupt_bitmap[i]) { - bit =3D ctz64(sregs.interrupt_bitmap[i]); - env->interrupt_injected =3D i * 64 + bit; - break; - } - } + /* + * The interrupt_bitmap is ignored because KVM_GET_SREGS is + * always preceded by KVM_GET_VCPU_EVENTS. + */ =20 get_seg(&env->segs[R_CS], &sregs.cs); get_seg(&env->segs[R_DS], &sregs.ds); --=20 2.33.1