From nobody Tue Apr 30 06:26:07 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 1641308772156257.66315569017877; Tue, 4 Jan 2022 07:06:12 -0800 (PST) Received: from localhost ([::1]:46878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lO7-0006sx-5b for importer@patchew.org; Tue, 04 Jan 2022 10:06:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52390) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGI-0006rn-FB for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:06 -0500 Received: from [2a00:1450:4864:20::531] (port=38652 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGH-0004Qj-37 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:06 -0500 Received: by mail-ed1-x531.google.com with SMTP id bm14so149553298edb.5 for ; Tue, 04 Jan 2022 06:58:04 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:03 -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=W1sRcArNgPLfMk3/muBjnzR5DIWfkwyjUMPup557DbA=; b=qIiHvWwMG0ay9mu8S9J0GnqeVv4Enihcj6XVQI6mpisAieQXDV0KLR1RtE05xGRhlP 2YslYq8QTi3gkgoRF1TTbldsw6aSDWASzWuEplPZNlOVDCHvyEBZcmdMYserMsQb8JCv 8v8d5lSE2qxxoMcfQW2Efay/qOCEFZsK9oQVyYDxPoFhH9/EpnCpoB9YcRv7lPzeJqrT Wmw/Je4o74afUY45WxHtzWiVeQILVhdqXQ5MdgLgRimRrfdRRBrGXMOh2CXOXaoxgaL+ QWv6Gg8deDVpCEcoGytsRS4c0yVwxO6/t9/v6nDSZmv9FM4Lw0iYh3cIMFNLkn6Xccsz kIzQ== 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=W1sRcArNgPLfMk3/muBjnzR5DIWfkwyjUMPup557DbA=; b=emS+aUHSv/e10unFr5esFG6yc+Gx4zUvS8tjyetDG8ZbPrpM547oIrYYtWpo6J3OEz NTASZtCS5h0sAt+WNpO6iqWsyfPCWA9VJX5CFkD3YXKQYtc8pnSUPkp9sk5LYkIQZyRt 3SjKnnamYMsMOprpINxzWCmyQtfgZ9Uc63f6UbUBZyQdnwgNy9jKDXWOhsmjtcYE+C/C g1Bxc7fsYgH/TderGjHclqj7/X1dnTIyNfxpg8QrBb1Iu+ASD48s3fIzzShjwsDIBSQ9 m1NbImKgzLADNOiSGvaMzZxK6LWipIjR4yxZG4FjeI9jLiiVukqAg9AVqQdygERTVatF 8bjw== X-Gm-Message-State: AOAM531xKZoJ+/GR4E44QSehsDD1lulj+bggMFgDERcpPOxnRQwCHihW i7K3QaxpSTHsHjvPg42rp76CNoDGSKI= X-Google-Smtp-Source: ABdhPJzMy30WPShzsHyUkRnWUmmHEpC/xC6klGiQLqOQZuvJVsClxMIKx6HEtH0pWw3N9p9tkmWnnw== X-Received: by 2002:a05:6402:2707:: with SMTP id y7mr35258069edd.256.1641308283943; Tue, 04 Jan 2022 06:58:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/15] meson: reuse common_user_inc when building files specific to user-mode emulators Date: Tue, 4 Jan 2022 15:57:35 +0100 Message-Id: <20220104145749.417387-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::531 (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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308774984100001 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 53065e96ec..de111d6fa1 100644 --- a/meson.build +++ b/meson.build @@ -2919,6 +2919,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) @@ -2927,7 +2928,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 Tue Apr 30 06:26:07 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 1641308430721360.167748801657; Tue, 4 Jan 2022 07:00:30 -0800 (PST) Received: from localhost ([::1]:37848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lID-0000ay-LG for importer@patchew.org; Tue, 04 Jan 2022 10:00:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52410) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGJ-0006tf-Fg for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:07 -0500 Received: from [2a00:1450:4864:20::535] (port=34751 helo=mail-ed1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGH-0004Qo-Pv for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:07 -0500 Received: by mail-ed1-x535.google.com with SMTP id u25so28206702edf.1 for ; Tue, 04 Jan 2022 06:58:05 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:04 -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=sn12UEUc7Qk8/uEupR3XTclgJmwgV1UmJePL9srNWJA=; b=eYsuJe0f9Q1Nkg2H1MOWFBS8DIdgxEjIh61Wh0wQebzzPxVqrF9frkfc4b138dOuch xsq2aE26ZMRPpypbhP9tRIQVsaZCnEsAYQOG5MJ6uDse9HbF1EkB3OhFe81HBPpJbhXC tlvTMiBun6zohWNEUCFPULqswo52RypxYplcAH8Hy97/BANcYX06l6K29vLsMClokUzK reNQU35UEHyfUjMmF4ZfJX68JIpH8uwPRaM/xKyu7udU6orJDr+2QSJZAGqG3ZnnsLNz Mt2qKVJ5TXkgiFZk9TQpLJ0Xi1WSOC5LlJtZ4tZxActAlmehq1Mnc9NN+bw5igK2d+hs 9lbA== 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=sn12UEUc7Qk8/uEupR3XTclgJmwgV1UmJePL9srNWJA=; b=Q74x0z+xhPgrPEF3uS7P9dFIyEj7LbPixMpzw9eV7lzCghrvF774kLZG3+ODMPLOLh 5wOcpmSGLMCHBTIU/l3Y9PJ9+3v2yrZ/Yi570mnUWxUfFn4e8gVwowOIHElJmmyZdQ/K +I5NeaPO7/152UG8/MydO1GPe9X6EiJIrPxsDOTIw2nkz1nHHFi8aH5W6yH+AeK64THf Kl4NBbf5+TAuZHTVIpeuBZT59K+6MXKVmz4qiB+X/VkoWSRK/+Si4uCX/r7cHZMygofK eCmPVpR96JPlCzydNtYhbKy7ZwYDmwoUbTZ/Ri1UyejxoZ1936ZFYK6Kfr95M6cm3qEW HM3A== X-Gm-Message-State: AOAM532jMWSuuzpRiDaQE8teQnaLPt/4rVxfBVApfm7ldYhHczsTTt3E pq+rASY2BKdFzJgMRpa2S/EGz/V4nJY= X-Google-Smtp-Source: ABdhPJwhFU4I6I2vRNKXchePw/yrau3A68VnpowexnVCSfr66Mx5ndQQHxlU3b5vuAqp/PNVQln3ew== X-Received: by 2002:a05:6402:1d81:: with SMTP id dk1mr49438320edb.328.1641308284579; Tue, 04 Jan 2022 06:58:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/15] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Date: Tue, 4 Jan 2022 15:57:36 +0100 Message-Id: <20220104145749.417387-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::535 (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::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308434018100001 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/loongarch64/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 ++-- 19 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/loongarch64/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/loongarch64/host-signal.h b/linux-user/include= /host/loongarch64/host-signal.h similarity index 100% rename from linux-user/host/loongarch64/host-signal.h rename to linux-user/include/host/loongarch64/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 Tue Apr 30 06:26:07 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 1641308915883738.7681302903397; Tue, 4 Jan 2022 07:08:35 -0800 (PST) Received: from localhost ([::1]:53930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lQR-0003Sy-7w for importer@patchew.org; Tue, 04 Jan 2022 10:08:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGK-0006v4-7y for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:08 -0500 Received: from [2a00:1450:4864:20::535] (port=41669 helo=mail-ed1-x535.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGI-0004Qs-PF for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:07 -0500 Received: by mail-ed1-x535.google.com with SMTP id b13so149500791edd.8 for ; Tue, 04 Jan 2022 06:58:06 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:05 -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=qU88x7OCGbAXGQHVucos0yBbnx+ISBbawYTCCn29Sk8=; b=NRBmkX11JCg0x2enOqRgf+rXUYu4nP6FcyE/JnKMteW/9ihgzfAdSWVqqsMKyJRMRL Sf8ZjYoZ0YYMfttU0QWNCUWQ1QNX5rCi1PvyTOyUUrQhzGf2KcQG8y9lR+/tu/mpgFVM bIRFOA5PG1cCs06GdRF/dfFyv31NCaaTKZpKImRtLmFLIh3btZL+Gj6yuisWxtvOGC5S OORnSocGrPSInqDP1q4bA1NsTawpqT5jto3cfZHt3jDryhGlZkbBq4fhZFzVU3bkl7md 6QCVAK1okMfy3+kAlLyAerbO7IMjC2CKlg75jDAxAQ3GTXfzA3F+gNgHHtB4etR2sAz1 KsXg== 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=qU88x7OCGbAXGQHVucos0yBbnx+ISBbawYTCCn29Sk8=; b=Rbe8U1RivsdzJHvafHE+xJEojPM+Wx1rInplbEKDT3+9RtzXA4ulnS72EURfpONiRQ cHCjpOVTJUkxeMNNsKHHXu+oe/xbVAYC/kNDTBOLjpKD251YMH9vRj0MGlNm0zNOz36D NNh6BifLaP4i/R+1fzduwI0SM2Ps1K+VYCornUHfvVVnAahiBIYx+lcEwX6OukoEByS/ A/36PxTzZ9D3PFhfOjaJEIOdHioI1s3FyZkG3f+1VUZrVx5+ubrmpnl1KUQUMD1YibY5 /MQWuZBID+DX3i/OAXQaqWBqKFjfVDXpuRJZu8ffjqmEdRKMX+G62NDNQkZ3rTTgT0OB cmbA== X-Gm-Message-State: AOAM532W9s3nbxPO1900hFCt2EKIzvk6e2k/i1Iy/JUgW90gIyl5FHdT ot04MYXJE83twPjqc2ASsQH5Z/56D74= X-Google-Smtp-Source: ABdhPJxSChZwJTsF8u5cKN747xb36ha3Xc9iUvBsHou1yrthneZrKtBtr0i8Pmi3kV+wv7imNBxaWQ== X-Received: by 2002:aa7:c1c1:: with SMTP id d1mr45631162edp.416.1641308285375; Tue, 04 Jan 2022 06:58:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/15] meson: cleanup common-user/ build Date: Tue, 4 Jan 2022 15:57:37 +0100 Message-Id: <20220104145749.417387-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::535 (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::535; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x535.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308917060100001 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 de111d6fa1..5f0b6300b4 100644 --- a/meson.build +++ b/meson.build @@ -2399,7 +2399,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() @@ -2651,17 +2650,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') @@ -2879,6 +2867,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 Tue Apr 30 06:26:07 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 1641308450339829.8223740786103; Tue, 4 Jan 2022 07:00:50 -0800 (PST) Received: from localhost ([::1]:38116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lIv-0000m9-Bm for importer@patchew.org; Tue, 04 Jan 2022 10:00:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52450) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGN-000713-7y for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:11 -0500 Received: from [2a00:1450:4864:20::534] (port=40831 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGL-0004RL-Dp for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:10 -0500 Received: by mail-ed1-x534.google.com with SMTP id z29so149499982edl.7 for ; Tue, 04 Jan 2022 06:58:09 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:07 -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=JePqecmS0meombKTS33f5FvbmSwi5wC8hckPf3PFsDw=; b=cW3+cCVEtrgHJdHGLU4AWkkV+JBbW4KRS9LA/yCfN6BVy4vh7F2vzLJb34GUIUB6Ag Bgz6g/YSd4grWXn4NWorWjnvfsk858lqbw/6dpdbSlLMHWd5NDyLdlnzISDQvv4b46KR 9Y1TQEaufzCs/UrTRxEu54uYXUdvpo+zLvAkTcDV5lZRx+opsZOPRjIXc9fEkPEJ5R/s Q0h6DoH9CYpgZHYP25ia4FO76pVTch24PRvn8WA7UKx1EnDrn2FT+rX6ZzUKJ9W/w9XJ W4hH6ykxISPnVhRoP7u7TRHaYrGvL3mh/ox0+XuYyU9f/yD3923/57CxzWnRb0JGsQIC Af4g== 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=JePqecmS0meombKTS33f5FvbmSwi5wC8hckPf3PFsDw=; b=Dal8SxUxDsIaJJhlMt5xZ0pq6RSRRIPD5nDdMhRMdkE6fyqW8wt/KVoLhMaNzk0VeE MIwW0Txvs/yqqh2bO4dpO2FgFjTJupLx/fqZzTbraznYeSxM9mj6eg7VQOskjPbGud3R UzOv1W6HGEx7CwtGaQtNVfC7e3bEhaoOATd5fpbGpyugdvPNym6EzuUaJSAa9lsv4kmG COboy4ardUfhO+/7w8mquMGe3Bix03By8HwL9Z06uHaro9Q/PaOIgTnAz5MyvuNDsWAX 6Q6CZSo3D+7Q+fZ3oWCqjerwGX93ceOL01LCc5dGtthGlgDTNzkizXHbneLX5Gq3zug4 Tuvw== X-Gm-Message-State: AOAM532ql5DVvF7Y7J6MUEU8e7hn/xKp5YF29FX0cKHO3PLpGT0nvbIp PbFe6uUodAC1FDyFVqEgEvcQCG4Hk4w= X-Google-Smtp-Source: ABdhPJwM9ZMzZA0E6lughvYPeVzmfq3zdOkHA2Byahme4oENSyVilwBmwU+RdOC9bL6h94yoQQZl3g== X-Received: by 2002:a05:6402:190c:: with SMTP id e12mr50248499edz.153.1641308288083; Tue, 04 Jan 2022 06:58:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/15] block/file-posix: Simplify the XFS_IOC_DIOINFO handling Date: Tue, 4 Jan 2022 15:57:38 +0100 Message-Id: <20220104145749.417387-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::534 (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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308453900100001 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 030728d11e..3a523a3d14 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" @@ -1021,10 +1020,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" @@ -1431,7 +1426,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 @@ -2323,28 +2317,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 @@ -3456,9 +3428,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 5f0b6300b4..5a57906e98 100644 --- a/meson.build +++ b/meson.build @@ -3445,7 +3445,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 Tue Apr 30 06:26:07 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 164130879263426.03616638811843; Tue, 4 Jan 2022 07:06:32 -0800 (PST) Received: from localhost ([::1]:47326 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lOR-0007At-MY for importer@patchew.org; Tue, 04 Jan 2022 10:06:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGQ-00075G-SM for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:14 -0500 Received: from [2a00:1450:4864:20::52b] (port=47101 helo=mail-ed1-x52b.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGO-0004SP-F1 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:14 -0500 Received: by mail-ed1-x52b.google.com with SMTP id n30so37413491eda.13 for ; Tue, 04 Jan 2022 06:58:11 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:09 -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=0X0s6/KkDwRVCgMNI8mr44TrPIa88nuV/cB6Oq70qfA=; b=jxVxfrC13W4WFfXtahzAdhs0HFNoD3eN5rA1ZgZ2U3O23b4nmFTPQ93QVpXqCFtodF FL/5kliesQP5NZj07TXE8Ro+RwjWmdZF0jG9mXyPYiya9ezFglA3FtFZ3W2gEToI6fwO ll9qwUHfc0JdKCaQenP/1vSC+mwqmc+fZGReVIB7yR4VSEWwo2oGIZeJgEjgSAEFQczz hgWbaCkESLMNisDckWR2rTB9r/kNPz5pyLTL+6dpEdSTI/NSpB4cN14bTBFC1d8tAf7U BE3dRJFbpWKnibLpX59/E1Xk80bLr+zmp8mc3DSkWwgAYSAQwyLIbgG/t9mRpXpYeZC/ 0OUA== 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=0X0s6/KkDwRVCgMNI8mr44TrPIa88nuV/cB6Oq70qfA=; b=Vt0zJlfKOX2SBkzZNjt5hZlIqCYEBzVfNAP7d62xBbArGKWtYPDDnuRHa/qcDGcBNV s8ubKCywP4HCsJtuzOvtQAg/dI6OV2tztDa1n8RYldKqhgi6ub9HiVlJKRoos3Qi7UzG 41BRpChajPpS9oMeZ/5kVlATgd7CftoGc3lXeY84J4DKOiLjxHpOv3F379uoI0DJiQzA /7Ezfli9Ms5iGBEj3JVqoSXybhXAAB5Ms8+SJCoNAD/TJk8U64QCzdcMVdPAJzyxOasl aLmvbzCRExFyPaXGl93IjPqPl5xVXj2mbGgV6xGDwSAhL00prH7ais/jvDNxRZT0rkt9 voBg== X-Gm-Message-State: AOAM533RacaEOON+G/l9vc3tRgbrjeiN15vA1mEXFze0RxRmWDrEVUkE T5/GYcv+7D8Gfc9Pbb9DjZcPfWBLcLg= X-Google-Smtp-Source: ABdhPJwjFryKKdnsEsNGff5D9oFu0RscMnfZvNfRehnn0Z1xrNa0DeSkNQX4Jkmw/zJ8bq4urKsZAw== X-Received: by 2002:a17:906:e2c5:: with SMTP id gr5mr41679498ejb.282.1641308290095; Tue, 04 Jan 2022 06:58:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/15] configure: simplify creation of plugin symbol list Date: Tue, 4 Jan 2022 15:57:39 +0100 Message-Id: <20220104145749.417387-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::52b (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::52b; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52b.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308794979100001 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 3a523a3d14..5e61439761 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 @@ -2317,69 +2316,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 Tue Apr 30 06:26:07 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 1641308671468156.49849596142485; Tue, 4 Jan 2022 07:04:31 -0800 (PST) Received: from localhost ([::1]:45196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lMU-0005lA-Pw for importer@patchew.org; Tue, 04 Jan 2022 10:04:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGQ-00075E-SN for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:14 -0500 Received: from [2a00:1450:4864:20::533] (port=40832 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGO-0004SS-Eu for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:13 -0500 Received: by mail-ed1-x533.google.com with SMTP id z29so149500574edl.7 for ; Tue, 04 Jan 2022 06:58:11 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:10 -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=AC6ErmWtRpsUx1brzrDK0Ia3KrPL2DwJ+38gkjtWVT8=; b=GnSHVV1aglHm/vR7bz/gQkSgyexbBdbNmSA9DEJh6Auv38TYIINwrIo5wW5WJIWYeA 40iQQWXCDV/HCvqNQVCiEIuZtQK9A3xjlIhloQNeRwlSoJkvU9YVbdahB8WLY4ZPi1tc wO5Njkaa/M5wOUB6SKBwyxBeNvcCU6HrWMcKfvqv9zRVwJtqFmOqHcHF4qfvIURQJyRw L9aswPneQEAsDr4qktu3HgPsoOlPx1UoOJ9zc6dRy0W/YsM16da9KjL9/2DNZ+nC+hzA CBnnqX9D7Fb3roReAlfcr/NvFm++rVOj1QsARlD11//xqDBOE20r3yruEHdl8ADulNMq 2XCQ== 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=AC6ErmWtRpsUx1brzrDK0Ia3KrPL2DwJ+38gkjtWVT8=; b=BFSN3W+sXUZCMp5SoGu18IRs1/O+nt+R8EF1mGxi8C6aaGrwmdw2tymiCFeI3r6y8j TLUHUnsgvMc2f3sVJ4ZJ904RUUHO2xgYvc04ILQK83Kz7FLg+SvdpBNal4OkMTax8mUl CZt1rG1O+AsPfXIdbM7NN4tBZSyWQGPQlrbNkQh4UjCF4Ov2SSwKpxV93kIchbcLP/pd Xxol06fYfKaSJg/P/qNHyw0w272HTUo43h2KCoJWBogcD1BOwCu5byPCWFE4cN+VGZls NMiU5B1V7qV2gJucEDcKWPJMMaSdWFpT5sEH3zqvlPsrtzRResJG03nbvB94DRFwmqpN 05FA== X-Gm-Message-State: AOAM5316i4t1kCwcirF7lHdEk5QPUICUMsU56/08gzPoTMUbGZTjNr9I fN8XCH2iF7CcSMredMtknuamL905PLE= X-Google-Smtp-Source: ABdhPJzdkP1iVtfqvcqTGJi7H9VRQ8rNT4pRR4XWGkRRXRLgGcFVIvdP0Cr/XtDBnRSZuHKPIsT4Hg== X-Received: by 2002:a05:6402:1702:: with SMTP id y2mr48948355edu.372.1641308291000; Tue, 04 Jan 2022 06:58:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/15] configure: do not set bsd_user/linux_user early Date: Tue, 4 Jan 2022 15:57:40 +0100 Message-Id: <20220104145749.417387-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::533 (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::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308674376100001 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 5e61439761..b93ba2c86c 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 @@ -1259,18 +1257,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/include/h= ost/$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 Tue Apr 30 06:26:07 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 1641309053293151.1373533961562; Tue, 4 Jan 2022 07:10:53 -0800 (PST) Received: from localhost ([::1]:58246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lSe-0006Nj-K5 for importer@patchew.org; Tue, 04 Jan 2022 10:10:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGS-00076m-MZ for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:18 -0500 Received: from [2a00:1450:4864:20::52d] (port=37608 helo=mail-ed1-x52d.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGQ-0004Sc-Jm for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:15 -0500 Received: by mail-ed1-x52d.google.com with SMTP id o6so149607684edc.4 for ; Tue, 04 Jan 2022 06:58:13 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:11 -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=DRHc5XYjpxHdggyvc6/mmrmqnbR8kQ1dcW31WaOO5JU=; b=afmq4Zzid/4VrJhtXkqy2WQUilhAqHoKSHSW3hAZ94HiFjNGBZI7NJIQbhPG/QLqSS qIBSbTL5MxlSn0LmQmWMYejFHM36HHvuo05GOOEtBgRyfKgRyKcxUzkmhwsTJADrPxh4 ATQCHBecMLkJ78L6ugd0TqOP1G44dG5U1iVHh3GfVfIL9RmEOQcUdu4Z8LRW4Kq9wXgV tUwistboiUfYdYQbBEvctA6JADPSQcpNBMCZ9qzTjJ3qyXfQaXJOuKTxMDrNdqKZsqly DCHJiyq4zsJxiAENnsmG9Xu4wWlRzc7eEqfr+DahJCxj8VY3Qiatii858cbQJj4olIJk 4gPA== 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=DRHc5XYjpxHdggyvc6/mmrmqnbR8kQ1dcW31WaOO5JU=; b=UEmqg5xSn4/52HJBfYiHzkxrsaRpF7xey7HT+bE00nxMvHVwwC+P/aCRNllxjhwJ/3 itnPGxTeuXOoLlQBSDmURVzOU2Rn2J9HG5WJKqvOMSLkDC3WO/Shz2IF11rXgAkpGv39 vULRhe1eOuv7PbTPLiBbKCY4jI8bIdugDFvX5ksL0wOvRQDm0gJs6lcr5BDUQWd48+GO M8ddamXeqwwIL+yZlwI428HiBJfXOUpW++/S3BIr24uqLj8zipeEn/5f8KXwO/tmCXFU 2NvczqnUclroOFhohbu1z6cVqjcjduAwkiCLnpsZ8u5vZBwPMF4SeRoNzgEotlT9Ysb7 xkDw== X-Gm-Message-State: AOAM530QaJCFF1XOUtxFR12uyAQJKxzLrkTOIZVj173f4kuKVwQhiycl Egkc3BMyCr/YRVjfjBev/h3rc5qHiNk= X-Google-Smtp-Source: ABdhPJxC3L9FoYoK5h+t4dGmyLwMY3MT4ICO4f2+dBvf3Bbh4y6WyLbbyLa9YaQVBAoCAWQIvltCig== X-Received: by 2002:a17:907:d93:: with SMTP id go19mr41609638ejc.537.1641308292221; Tue, 04 Jan 2022 06:58:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/15] configure, makefile: remove traces of really old files Date: Tue, 4 Jan 2022 15:57:41 +0100 Message-Id: <20220104145749.417387-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::52d (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::52d; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52d.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309056416100001 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 5d66c35ea5..8037f73b35 100644 --- a/Makefile +++ b/Makefile @@ -206,14 +206,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 @@ -224,10 +221,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 b93ba2c86c..851eb35dbe 100755 --- a/configure +++ b/configure @@ -3671,9 +3671,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" @@ -3685,7 +3682,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 \ @@ -3707,11 +3703,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 Tue Apr 30 06:26:07 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 1641308886622816.9819646466142; Tue, 4 Jan 2022 07:08:06 -0800 (PST) Received: from localhost ([::1]:52946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lPx-0002mP-V9 for importer@patchew.org; Tue, 04 Jan 2022 10:08:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGU-00077O-Kh for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:18 -0500 Received: from [2a00:1450:4864:20::534] (port=36563 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGS-0004Sv-EQ for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:17 -0500 Received: by mail-ed1-x534.google.com with SMTP id q14so141736008edi.3 for ; Tue, 04 Jan 2022 06:58:15 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:14 -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=6PcERMUghxJSRl5rwd0mke+3ok8bkde8T6lIuSD9j10=; b=nuxxUjBdmfzMJ+W0KE5rNZ5KuS8MTeZ9uRLUX+/ed0mDgkJLVM6zf2ddnka/T6h9V2 PpAqkjezbCuGvcJWxqWPuPUjhvitydId8CtD9ubD+qJHWrJkPEZswWnAw+CE2GUEjv2z J1bcG+CQT2PIw5s/QuOdckA7MLKzYCrd7+3G9yIEc4LlPdCkcTi3Ckb6irMLI8A5SGGX HEhlK+RPe1d4B4dileG+rKDCzxU2/Qnu0mHP0Kc5lgDEFo/0MK1CwkEl73Xcu5Xtcrzi uSbRhzaEyVqdORYKySgz+6uG0kPbFrdaYbxwPMJ3ZUIrt1MY6WpQxZThb7JpaXjwwmJs ZL9g== 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=6PcERMUghxJSRl5rwd0mke+3ok8bkde8T6lIuSD9j10=; b=e8d0+bLnoN7O14rsQll99kSViEDufn3SwMpVB8DEWwNwZzJbYdFF8MMkvYCaXjeTcn yAMo1+mxrQKZGJWzd6PtiDxdwfIycEcLi09hxkiK4Z8odNi4gD6CYFNN2BS6jhKWoRIT zfuigmFGG5n7F5gZ+aBd8TYpZJjtPVU8+o65huWwdaUn2vcOvVnbTW6kMsrd9FDFGxWN 1nAHevJgwYjoKyxGFNRJBR8ztIVcANPVIbGJqv5pJ7zVa4YIzprOKEBneMtURNVVkuCc /dhr/G1oAe0s7Brc/H7qbFtBP6F6eHUpnuyV3JHpwGPtlTvNfhvIQaadSZdcZS/Be0En O0Tg== X-Gm-Message-State: AOAM532RBbG9PZvaGayJkXylPdr6mFLuvMBdcYq7uRTJekqG/QENCOml gN3MZzLEnV3c1drC6Ofo5i/9lVgwBKk= X-Google-Smtp-Source: ABdhPJzlQn8ey6R29zSRnfxw8hw7SOqoS616/H6JaSW+UD65/rTEeGLzKuPRXiowMvKuE+fb4V/HPg== X-Received: by 2002:a17:906:5d15:: with SMTP id g21mr38702432ejt.350.1641308294449; Tue, 04 Jan 2022 06:58:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/15] configure: parse --enable/--disable-strip automatically, flip default Date: Tue, 4 Jan 2022 15:57:42 +0100 Message-Id: <20220104145749.417387-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::534 (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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641308888633100001 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 851eb35dbe..9e01b2278e 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"" @@ -892,7 +891,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" @@ -903,8 +901,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" @@ -1367,7 +1363,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 @@ -3314,9 +3309,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 @@ -3594,6 +3586,7 @@ echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak echo "GLIB_VERSION=3D$(pkg-config --modversion glib-2.0)" >> $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 @@ -3811,7 +3804,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 50bd7bed4d..a4af02c527 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:' @@ -237,6 +238,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 Tue Apr 30 06:26:07 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 164130920287572.92472925400159; Tue, 4 Jan 2022 07:13:22 -0800 (PST) Received: from localhost ([::1]:37772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lV4-0002PG-4r for importer@patchew.org; Tue, 04 Jan 2022 10:13:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGW-0007AI-HO for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:22 -0500 Received: from [2a00:1450:4864:20::531] (port=35548 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGU-0004T7-Bc for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:19 -0500 Received: by mail-ed1-x531.google.com with SMTP id y22so149620533edq.2 for ; Tue, 04 Jan 2022 06:58:17 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:16 -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=owvX4P9y0f81YuJV9NBqPRhs+vGIQfiyyOxrzRSgqoI=; b=P2IZLHX0MDVM0UGjklPV3tWoFtC94wh9Vhxo2svWFuT3vjaFc5iZnvpPBvDim6rhMv FrFdbQ8GgLwwjSZM7eI2v+23d4nJrMhpxVR0JkFUCGnpwccaPoExndfY6x5aZphWzR4O bpcqATuxVLL9ErwRuh7PP+/dEAnkQl06GOTvxWu9BeoKu1lRqKp6GF/lViPKcsCzSRmF zMo7wI1oJ9gSYJKCYSOHxdl3Eztly9Jfft73rAAEr1QTvmBEx0M183elh/y/EJ5byAiM tvmq2NLK8vKTWWLHchIxXKKDgBfqkEK/xlGLSsbiEnCS0Xk58wspn7nipmPwRK7Hduks BEDg== 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=owvX4P9y0f81YuJV9NBqPRhs+vGIQfiyyOxrzRSgqoI=; b=7u9UGT5mlP0N1IZq2GgeLR4ry0nfYU4N5svIn0oTQ6X9drafklAEQSnVMhRdXVlF+Q 28xzbkLN19T7rNFqQSdMMoPTlMAhBhLNCDsZOAibU4XOmRrMWF7Y69BANjhgKm7i97zv kPSCNd98JXY7xrcV+xY96GpxSKoiJlaOAvfq2YPtstRcEKqlFn0JsBHCoQCMhb1tKqUO Z/kq2qm/0+NMg/HrSbLq7Jp8nrfFUyXb2+HMCIytvYXwjSCb2WuBKP3o/uj26+I+IxO4 /XfYyKHqN1wk0PBJHLW69kh687yRBGvKQxBgQ9vcARSbYnnVKC9t5V50ty1c0DLaVuir AIMA== X-Gm-Message-State: AOAM532e6eYe7xPYNkOqki9Rom/RV15ikFrLW02kjKxfJ6hE2pzZ/h3Y V5NuGtsThiIhqMAowGvh6Z3tyt8eEJQ= X-Google-Smtp-Source: ABdhPJyRukKyeosc/qhb4xpUahioiZhvojYpQE25STVuL0z64IpOiYu4eXy+DjGqnUS6y01RHrE36A== X-Received: by 2002:a05:6402:2744:: with SMTP id z4mr49595120edd.68.1641308296855; Tue, 04 Jan 2022 06:58:16 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/15] configure: move non-command-line variables away from command-line parsing section Date: Tue, 4 Jan 2022 15:57:43 +0100 Message-Id: <20220104145749.417387-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::531 (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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309205076100001 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 9e01b2278e..e3d603d381 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" @@ -2548,6 +2546,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 @@ -2578,7 +2577,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 @@ -2605,6 +2603,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 Tue Apr 30 06:26:07 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 1641309347968809.6414590930574; Tue, 4 Jan 2022 07:15:47 -0800 (PST) Received: from localhost ([::1]:44702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lXO-0006P3-WF for importer@patchew.org; Tue, 04 Jan 2022 10:15:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52552) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGZ-0007BO-US for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:23 -0500 Received: from [2a00:1450:4864:20::530] (port=38657 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGW-0004TC-98 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:21 -0500 Received: by mail-ed1-x530.google.com with SMTP id bm14so149555861edb.5 for ; Tue, 04 Jan 2022 06:58:18 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:17 -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=UpQKU9eeS/K9v2ETi9WgANOx2H7FuRiwng2evvCm57c9pDfdovNB+fS4ryW2iTSuBr w/D/3V8iUO6w9CwcrRghTF10MvOAbeUIV0M+FSA4G+93FINliz9uJvIvzzMPfZ6Y4pn1 8BenerqnG/h0sMSEXo1uKuBKG7nvLEtaWOW9FHxlubKllHucSKRfTc1ASgONJeM6zhv1 tBOvca+v4PWuQ75BxUvlYcnBkBqHAZzSxk2q1wH7+5RW2IeCtzgGQBZiu3EwQY1ZovG8 rKFxcRqdzKeW1j998vRxzhy+JjdeaEZsvVGJrSS6q3F6Xm7tbE82stvDeurWbNB3b1Mo 0BGg== 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=K0tNLivsFnHfqOlGW/wCFbh3bwrh1Ubm/DNn/6WB4mmP4VQBMfttce/oShrDt5pj+E L105gi2LSXvjeGBkRYSnRRs7bF6NcpvUrFn+9VY7TCn0Q5/N48RMVyd8C9oLRS4z/jYM GH2g2Egj7Cjr4Afhb/k6xEqQeryk8oICV1bteeZSvC3CTtyBy2yBXikzmTMp1iyi3PjZ RIetjh3eFeISOLsJEMF5V8UwIMcvU60jTdqV3oa76kNsYI9tEAzMPqVxIJcq3MFVeZ6q xCgsWBcsp+5rbBCZm+RQVV8R8ypZ78u56cg2nFVQ49lGPTMs8nivqc8n22qSuH67Lskj 5G3g== X-Gm-Message-State: AOAM5318vKgetVSSFRq0AfwqVu0FbPTRMrUR01rV1TbYl7KS9WneFnsP //7DsIk121+utgKnfY6jIHK1doGnafA= X-Google-Smtp-Source: ABdhPJwofQKnPIFN1e9j31nVzsqG7aZXJjdKYh6/hTLeoo9dUaHunRMDoCB0WczcPKeuHfbx6U0x2g== X-Received: by 2002:a17:906:8283:: with SMTP id h3mr1247246ejx.608.1641308298029; Tue, 04 Jan 2022 06:58:18 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/15] meson: build contrib/ executables after generated headers Date: Tue, 4 Jan 2022 15:57:44 +0100 Message-Id: <20220104145749.417387-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::530 (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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309349577100001 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 Tue Apr 30 06:26:07 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 1641309015650112.29769908784942; Tue, 4 Jan 2022 07:10:15 -0800 (PST) Received: from localhost ([::1]:57406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lS2-0005nG-C2 for importer@patchew.org; Tue, 04 Jan 2022 10:10:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGa-0007Ch-B3 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:24 -0500 Received: from [2a00:1450:4864:20::533] (port=33697 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGX-0004TN-98 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:22 -0500 Received: by mail-ed1-x533.google.com with SMTP id m21so150743983edc.0 for ; Tue, 04 Jan 2022 06:58:20 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:19 -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=+E66IqNCT2gLnUgFCZeM7BI9JgDWyXcfb0XGm+77LJI=; b=joASk/TOleFA1ufQ0hR+4B/DzUKmHVmqpqQbPnyRicxwrJrERiBnht9NyQkm0Y705n JMW5nCbEMfgYLWl8luiie73o8getgmBf1KhN2wXONJExGHlbsv2PpHUiW1BAohxLfKS+ 2pz+t4kQ+ohFKlTrqUSnOfxoZw4vuobYq3ewjurKGz7iL7i7O5KIJ8erVB7EuwaOnZvb mh+hIKgOU34GtXKH+bcWGrqWvefnXANZHw0wTyaH2i/c6SGZ/m4DrL/C6/cp8obcfi1T +TfHh7oyU4VLNp2he+MzW0EKVQ1JEOwjkH3n1SBY8IDGpV82+DklK09S66ImfIYGDfhu 3B1g== 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=+E66IqNCT2gLnUgFCZeM7BI9JgDWyXcfb0XGm+77LJI=; b=kEHq0cGi1vZLH2O/Z3rHfZzM1XBGzhwHfVxhbqm/UFHlE5AXS4kKBNmESTWhZ5ogzh JYLFlRvvY7A8V4ZVTtA07EEXqfYV3NpuKe7ZsmslcRXBU5159esDzH/nUSDm3aZFO6gW FzshbO5bJEFsQoS8zuJnnS7wjRdeqVqA+CBVOJ3rjgPP17KHg9xziHGKlbEgQzan2FfS NOh6t20lYLfw3gdHSMdZ7vT4dHxh2Wjts+YgXu4Bfkyr4vM9isBVd32QrziE+3akS03y DfkxmwDdGge45layESVhlsI3e8FpL5qZMLk1bgEeA1PRqsuwdaDsr0aKASQJgRyVPdER JrmA== X-Gm-Message-State: AOAM5318deRhz70REoKkqLWeS+itLDJ7I/tKcVXgd/ecuMmS7VMPmP/w XrIp85oEeJa1TLQ2AP8iiY/D5d42xec= X-Google-Smtp-Source: ABdhPJwpm1kSiOB3yt6OqC60izgKcDZ9Dt5RQ0knmIs/bOHdbrtt7HH3GcvY6P0YShP4aH8152LvDA== X-Received: by 2002:a17:907:2d12:: with SMTP id gs18mr40136439ejc.198.1641308299805; Tue, 04 Jan 2022 06:58:19 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/15] configure, meson: move config-poison.h to meson Date: Tue, 4 Jan 2022 15:57:45 +0100 Message-Id: <20220104145749.417387-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::533 (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::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309017940100003 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 8037f73b35..9e2e3bf004 100644 --- a/Makefile +++ b/Makefile @@ -221,7 +221,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 e3d603d381..187632c371 100755 --- a/configure +++ b/configure @@ -3833,17 +3833,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 5a57906e98..36fc720ba3 100644 --- a/meson.build +++ b/meson.build @@ -2028,6 +2028,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 Tue Apr 30 06:26:07 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 1641309483553473.9993925882932; Tue, 4 Jan 2022 07:18:03 -0800 (PST) Received: from localhost ([::1]:49098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lZa-00014s-5c for importer@patchew.org; Tue, 04 Jan 2022 10:18:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52572) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGc-0007Fh-Eh for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:26 -0500 Received: from [2a00:1450:4864:20::52e] (port=39641 helo=mail-ed1-x52e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGa-0004Tn-21 for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:25 -0500 Received: by mail-ed1-x52e.google.com with SMTP id f5so149581616edq.6 for ; Tue, 04 Jan 2022 06:58:23 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:22 -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=lV2rTUdM+LnDXLeS+qWWf2AzxWW8/OVgd5CrN+RzjDc=; b=KgdmmJec8msFScG84e3fan2poIS6D0pP6xFW+7zg9eADRsIPffYGpmpnJD6YykgOkA egec8zJBAIQQ23UbMVApG54svDg74UKwBl2PYx0AglE4HcP0hPXMF4AatG9UZ9shRDoW FEqtfS01VQmrSfdtjaMWvDQ/YwH1mC4i5/0v/N8rrPP43e+3gA4or+/bVPFfRf6Zhuhu DrWVbjSCOdSyP1AQlOOgu4Wzw75HLswquRhdH9WdO/DYMBLNjjJ2UqKLzmArkOLlwBYv tC4AZ0WqFVOA6fy/sm4P7L+G89mrI89iOxDj8eGFm53ugQ9w5Cce7chP16PV66g88vgO +CQw== 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=lV2rTUdM+LnDXLeS+qWWf2AzxWW8/OVgd5CrN+RzjDc=; b=NkTR2ga0suVrZrEpzx/JuC5RHmN+ImL2ekogtwYsgpNJtG0CXxf1HFyJatxcS8QcN0 iuPMFTtVMnHPevIsA+Wv6CcyDc0mIHbepiJ2jBV+K6BBGc521ap/QYfrOXLBkrqaJytv 8bzFDA+tQILVjaj8hkvMUmSvm6NliF94yG+kTTzssc9LfYVToT+KTxMYBKQQqkhVKv7e 7eLicFnIKZTeMi60aoR8V+qowHxcYczpR3NRTNrisdrheRhXLPE0iWW9PjpNLkuLUxEX tMBhg266CYBegsIrCz5cVlydTuLxMPg10eJXudSNCMsNsOR5E8sjvoB2oiG6UUqF9y+y 7RlA== X-Gm-Message-State: AOAM532vSkksWzo7ry8poxh8hqIMt8JoNkiulQaw8OzFaVmjg3BBm0G6 q2HAA8qixQRBffACAq9AeuR1rv9lOC8= X-Google-Smtp-Source: ABdhPJwcMfWYAIEyyqZ/WZE0rK+aM6FJm+NWQptKiZljAsaXwTCeUbe8sjxHQ5x7Nwl4m9UkQ8nT8w== X-Received: by 2002:a05:6402:2024:: with SMTP id ay4mr49378120edb.16.1641308302570; Tue, 04 Jan 2022 06:58:22 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/15] meson: add comments in the target-specific flags section Date: Tue, 4 Jan 2022 15:57:46 +0100 Message-Id: <20220104145749.417387-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::52e (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::52e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52e.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309485946100001 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 36fc720ba3..6489ff8425 100644 --- a/meson.build +++ b/meson.build @@ -238,6 +238,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 @@ -249,6 +250,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 @@ -262,6 +264,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 @@ -271,6 +274,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) @@ -311,6 +315,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 Tue Apr 30 06:26:07 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 1641309161449584.656799993249; Tue, 4 Jan 2022 07:12:41 -0800 (PST) Received: from localhost ([::1]:36318 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lUO-0001b2-BW for importer@patchew.org; Tue, 04 Jan 2022 10:12:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52584) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGe-0007Ia-At for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:28 -0500 Received: from [2a00:1450:4864:20::533] (port=35552 helo=mail-ed1-x533.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGb-0004Ts-Ck for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:27 -0500 Received: by mail-ed1-x533.google.com with SMTP id y22so149621838edq.2 for ; Tue, 04 Jan 2022 06:58:24 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:22 -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=o6basLUSpfYP+RNWYxYiGuqGzSH9To0lFR0xYSUXibRNAlw82WcV6tHes64kjtLtwW vbr21Z80wuQcqeQlUH77y9GZvVwUXzRfIeog7S+6c88KKkkgws7tAQwXZtKokhJHvA6r QpTODcBcSxNIT1RVDiRq9GZ8Wb6e4ST0jv1KbdSepzj87VBwYZvvs+jl9GS4lko8jXMC GyfF6YX/ABRnMRoj1djSchQZ32Kox4EV9Wvvp2d23FKc9D1HOE6aha+cC93OmBXbByIb OHGxDIHEZNhaW2JX3A91CNrCefGlgD8EwSAjelmd6zC8d0kWIreM74iVigoMrljT36/W QGTg== 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=jyIlKNJoBfW/wflk8TPZ6E+l2KhWy/YTcHLcUKDei7/Nsgw4bDOWXips/2vlDbIUIl WBlJm8YCfzMUm5H+ISFwSKFTw5VmVF1Osiav9r8UfhKHurmjCZ6sfkhE8ELNOUS9Ks92 r34y73oz7Ml2ZXGVmHjFd0ZuiAzTrIDBx1OyO6T0XLk5NUvuZooIsyTHeUYmfb+YDnSo mPGOH8XzIsujwz/Sdd89l884KsphrcTF7le879EPsi/Rxew40dNbcG7PRaTWwK9b1mjJ NO2c/2yXkCKQTEu+BvtA9QfW2zXlI1tqejNpbdQDCGvHcwG0iDJWm3k1fjQ/RqVuGQxm LJ7w== X-Gm-Message-State: AOAM532w/83Vt6PX1KjrLT4u2WpjVgdywWJz3dnuhfXniYsQei7RgGnd +0AAAf1hjKxGOYPLRumh5MVqxNAPaNI= X-Google-Smtp-Source: ABdhPJz9SdTrTUKVwr+UcSiRrrpxcCAaL7x3xlhJnO+bIPQVbByE9AoPB4lLuYNz9jKjXeUxyzpHQg== X-Received: by 2002:a17:906:9756:: with SMTP id o22mr39196647ejy.324.1641308303246; Tue, 04 Jan 2022 06:58:23 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/15] KVM: use KVM_{GET|SET}_SREGS2 when supported. Date: Tue, 4 Jan 2022 15:57:47 +0100 Message-Id: <20220104145749.417387-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::533 (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::533; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x533.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309163365100001 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 Tue Apr 30 06:26:07 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 1641309571622763.9369725748155; Tue, 4 Jan 2022 07:19:31 -0800 (PST) Received: from localhost ([::1]:53448 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lb0-00041d-Ca for importer@patchew.org; Tue, 04 Jan 2022 10:19:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGh-0007Ps-2S for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:31 -0500 Received: from [2a00:1450:4864:20::531] (port=36565 helo=mail-ed1-x531.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGe-0004UP-VJ for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:30 -0500 Received: by mail-ed1-x531.google.com with SMTP id q14so141738525edi.3 for ; Tue, 04 Jan 2022 06:58:28 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:27 -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=dXyVovMHs/liKPCnpvRWCLafVJ8jxNGptJde04XA/mnCpHLLUe+HBKUykMaXxs/1Bl y3gUAQ0q1qmud4r/vENT6UTKJIA9bq5xOWvmORBvH0aIbHDSflfBoacWvgna/D/reilZ Xy7C7yBuq7eSTFziqmCmXUhqDjbrlmiRCjmpw8EFn3d9ky0ZDrY4dUO3YuJ0A1pT84An oAKjQjfIDDe3mlVw9A4IL/dlzpZVFVEGvC6NWIYrDZyTQSf2hPal1mOPTPH1yXM1vY+/ NVIMBf5UiNEPpQgK3AvjyTcNbH16lsCPyl617NgfnJOJnYCbxi1OHmPjQKtIcuIRxYxW LNYA== 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=foiao/LWOe30n2hEAQXDghJyeK6Ss5pgCWaAPGD/3Pv8WC/y2f8pEzKONUh2E40U6B T7IaZo+evK3PnLPwSHsn6DOdxpfaIlpjzCGLTVD9nJLVaEQO5QoMJznEmjVFkNf5FE8I EzdnHhYtU99nanreciBT8NVqp3xJLMHcCGWmCUU8nLsSAPBDd7qN63NB8arSzrmKzzMz rvGibwczi0YgtZVzr34wJjl3WaHJ7J4bNpgd9FRxzrweZG8VSsmRkerx1v1CKXyPk1yN sgEx9Z//IMaMtudATT9kUEH/SWiT3CoF83jkA6C0qVg1Kf+EaMzrLCrfLUpx+j6DCkMR EFYw== X-Gm-Message-State: AOAM532PdC6WqxoPCEzrv9fsMGr4eU4fMRvSAEEJ2kC6J++kjZ3NDFkW 9EqFcumo8hDbKqtGymA4jREHeUNk9v4= X-Google-Smtp-Source: ABdhPJyMvu57i3k1TikZKlt/p/lDY0l2Jlh8o9DUJitqSGZY3gUVGq8EIaMlWiUer1yJ7VAPj+0ENA== X-Received: by 2002:a17:906:1996:: with SMTP id g22mr39601384ejd.661.1641308307480; Tue, 04 Jan 2022 06:58:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/15] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS Date: Tue, 4 Jan 2022 15:57:48 +0100 Message-Id: <20220104145749.417387-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::531 (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::531; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x531.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309574395100001 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 From nobody Tue Apr 30 06:26:07 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 1641309299348690.9913235400281; Tue, 4 Jan 2022 07:14:59 -0800 (PST) Received: from localhost ([::1]:43940 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lWc-0005sz-9H for importer@patchew.org; Tue, 04 Jan 2022 10:14:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52618) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGh-0007RL-Gv for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:31 -0500 Received: from [2a00:1450:4864:20::530] (port=42965 helo=mail-ed1-x530.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4lGf-0004UZ-Kg for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:31 -0500 Received: by mail-ed1-x530.google.com with SMTP id j21so149431580edt.9 for ; Tue, 04 Jan 2022 06:58:28 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:27 -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=raXOgou5jVKECUtcQISBg+Quw7i8HlpQqMT1vsPNKj0=; b=qrbnDYJDb5mTz89tYnzMC8mjYhowqHXEGUKExV4KntxcqxWCi86RGia241rjXcxcSF PMSeQm79XkzBaqhH+lGUk4ilsjNkvwLilFP0ArM1rEoAmOtGn8JQh8UplhU0xm4udeDt 8pe3mlzEWS1tNzJ8MFU3bHtS1z6lC1Cpwi1sCBLtipHDwWek6RFO+WD3fdtKhIpImpGs jOXIQI6SYK7X9IA1QEdoyYkgSOy+9tc5NFmhLCiVQXuIcM5JHlh4FvZdwCYeT+AOuSsu 7wEiND5IxpDvCbVGSCFVBOdFGkXY7yRdkTQcG1zfh8HUTDmD8S0W7uxZMEiPrcdiPqkD gi1g== 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=raXOgou5jVKECUtcQISBg+Quw7i8HlpQqMT1vsPNKj0=; b=vSba6YANoFVHf/2VJRkGuFXh1wAOho6pL4BjfxhVdnhsWlUZiER03nVKJjmizVOjMI 7Ax1s6ag7Ab7wf+lrEz7WxJGfKfsrD3jHt5SiDiE8thaSZ2SkTcI+nqQ23p7ooWmIMfL usOy732Dp1pN/qQns1xJMUQ0bt+Yb0DHef9VQpoHeSi7qtP4U5/NWz0iSAqROhTtCWoc dSx/AZ/JOCbESDhbtDdco1v6kAYmC/7loM0/DHWXsQMY1jp1LRXLm0CEOLqr4U3aFDpW HLb2UjusxKFpG1djstrcSfIhXti0f3D/qNxZPqsTKrdQD/Dep2GM9JBesjdL0ia9lig2 b4VQ== X-Gm-Message-State: AOAM5317sPKClFyt9FeULCGiV/gZifnfz8SBzMviei6Wf80QgSoDrQq0 WWRM7SLdKGbR/2Fv+M7vkxRj9p6kWJg= X-Google-Smtp-Source: ABdhPJxY67lWuj1xSEH3VAGocuM3G5vIcNdpCJA2hVQ40++6Y0Qnb7y2BfhffdHMRT/mKsdkhYlXUA== X-Received: by 2002:aa7:c641:: with SMTP id z1mr49308282edr.84.1641308308143; Tue, 04 Jan 2022 06:58:28 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/15] tests/tcg: Fix target-specific Makefile variables path for user-mode Date: Tue, 4 Jan 2022 15:57:49 +0100 Message-Id: <20220104145749.417387-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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::530 (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::530; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x530.google.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, 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: 1641309301474100001 From: Philippe Mathieu-Daud=C3=A9 Commit 812b31d3f91 refactor missed to update this path. Fixes: 812b31d3f91 ("configs: rename default-configs to configs and reorgan= ise") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20211226001541.3807919-1-f4bug@amsat.org> Signed-off-by: Paolo Bonzini --- tests/tcg/Makefile.target | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 0f8645f782..ae8004c76e 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -33,7 +33,7 @@ all: -include ../../../config-host.mak -include ../config-$(TARGET).mak ifeq ($(CONFIG_USER_ONLY),y) --include $(SRC_PATH)/default-configs/targets/$(TARGET).mak +-include $(SRC_PATH)/configs/targets/$(TARGET)/default.mak endif =20 # for including , in command strings --=20 2.33.1