From nobody Sat May 4 10:05:49 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 1641826746821462.6362923306883; Mon, 10 Jan 2022 06:59:06 -0800 (PST) Received: from localhost ([::1]:38846 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6w8X-0003OR-Nu for importer@patchew.org; Mon, 10 Jan 2022 09:59:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqm-0001pr-QS for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:44 -0500 Received: from [2a00:1450:4864:20::530] (port=38630 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 1n6vql-0000SC-5s for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:44 -0500 Received: by mail-ed1-x530.google.com with SMTP id u21so31868538edd.5 for ; Mon, 10 Jan 2022 06:40:42 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=W1sRcArNgPLfMk3/muBjnzR5DIWfkwyjUMPup557DbA=; b=oyRj5qf/dNS07mETBS8ZTpGU83fTTsCFZXuEkM8qlv8Z9oi5UiyhGKrIg/UZxJZlDo n/gweIL7os5KrsYc1cWhoutFmcDVQ++YdFBEuBf95ttaPp0TvQ4A1l5OGocRc0F7auar gUmApoi+coeQNP+8D4dFcAMyVDsnr3V67pXRgBX8pVVObvko39xnzhOI5iTTLp+3Vsnu VC2H0jaQ8REuA9Q8Y/kWESojSKpwAQ59gz63zc2d4VWC+U21SFGUgL9oV2MsIcwZ71L7 VQGjrWDcjq2GY1vsbAa9iQXyC81CDTZdDYhfoBZrhSTFPDc1uzX1b3xv74fiGgQHH96o /jUw== 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=cM5x7IypO8uhgCWbrHgn0gx8du2YHqwmeP0tXZkpU2cyyUMEpTcmZ5jL7y/Qqt9bDW AeMIkUtBsTdf5Xd/RJ+DwD3EnGRlJcMtyGPZGdmXEJt5faV3nJj/AmwDe0VMwvJcRsdq yeHtvBfwdZjV93kOfpqOlqL+LjpTxHU2tKpYzJOZqqoiZkb8GjJkmhc2gKBMAX4Kq21W na15GhS6mwEJUOCgX448is5lYGqxAdntAZ2c8bBjX4bTMIe8FZGtpnvzCqEMPMqV1PCJ LHmGiZHKEdiFczHT3S3qs5WWnHhKxqHp3hvXcFDDlckonpPAIfvqByLw8FtL0GGQryAn efzw== X-Gm-Message-State: AOAM531gaT0Nmbm9HOFPYQTpuqXjFfCaxJpCjni/OikkTBorxrSHMJMD RtHWXW5uYBhgHY6rsgzdUD704C8Ps9Y= X-Google-Smtp-Source: ABdhPJwwYxu0sqU/3yH83hnM9dmGrZVf0zyqUcY4w748p6YS3uffF7/bk5YVpzJ2ZEthSIgvc6sxUQ== X-Received: by 2002:a17:907:7d8f:: with SMTP id oz15mr38387ejc.245.1641825641632; Mon, 10 Jan 2022 06:40:41 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/18] meson: reuse common_user_inc when building files specific to user-mode emulators Date: Mon, 10 Jan 2022 15:40:17 +0100 Message-Id: <20220110144034.67410-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641826747315100001 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 Sat May 4 10:05:49 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 1641827035121707.585443952768; Mon, 10 Jan 2022 07:03:55 -0800 (PST) Received: from localhost ([::1]:45930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wDB-0000DO-Pz for importer@patchew.org; Mon, 10 Jan 2022 10:03:53 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqp-0001t3-4q for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:47 -0500 Received: from [2a00:1450:4864:20::52a] (port=45876 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vqm-0000SM-23 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:46 -0500 Received: by mail-ed1-x52a.google.com with SMTP id z22so9368262edd.12 for ; Mon, 10 Jan 2022 06:40:43 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:42 -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=Nm8cbOfTkdpXDRvcQ2MNOdWE6nG8SHZcIMIVSEPWJVRA3qWMxbo4kA1gKglJBtA8Vj 0OsuqEwpHCoFMPm5mXnn3/n1vJT40ieSJvY2qB2qEsujvvOnf27VzLJ97MvI/nlOsS8G JtnSEl9Hf7AeN5VZtXqi+VCVnsA504M/Pi+GunW3mSs3sJhhzH1o4KuJGQ82Jg+YpAxz UfQEwuu0lbvNwPgzMyzWg38xc4b74eqaGS/2XL7R0ebmxx7NiOM92nvdEJDluiZgzYRB ql39WdkyyE3OGuXEIFmQZUVqCLc5JhOmTqh71uyL1FSG8tlz2mXrmXFms/8QSMgNfbuP sVsA== 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=dpH1ngOKet7yNnWGGDorHRVni+AJfMCGRKBmjr0qb+5khdU3x2PBQvPUKYR4HhtPmI gAo11YqJI66+on6KhcI5zsFy9iXrqS8AmyKNjplTMhU822I/QEzVVqkmj+UboedBlWT9 urqJvYhi5T2L5GwpeD5V+m93GGOiluhD6QvhtZoipWr/cCIIg/5oH9Bdm7gKjJ+cZcro tTpBh7Fkq3HJltKW0YtB4xFMulERvYQD/5SMM1E1Ypy/aoMio2ZwEhYQPwUpFMkpTug7 E6WsK85SaGQVqqlYVRElCVVJKLqtlQFTg7C7/HplXztLqyMUCAlhgOaXPLDyYNbbec6K ek0A== X-Gm-Message-State: AOAM533UqMUJ9eoU/7CTnRRGYYz41KrmSbz3cXTITeb0O3am7ubnhP6w Z28h8HRnHr8/Vpmo0UsmJYTFnRR5954= X-Google-Smtp-Source: ABdhPJxXTG+SCohTSNPKQQv5+fJ9etc10idBS2gP7rEdkUanalwA5CrGE42wRowhwuO6v9KufdJLGA== X-Received: by 2002:a50:f105:: with SMTP id w5mr23155186edl.222.1641825642790; Mon, 10 Jan 2022 06:40:42 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/18] user: move common-user includes to a subdirectory of {bsd, linux}-user/ Date: Mon, 10 Jan 2022 15:40:18 +0100 Message-Id: <20220110144034.67410-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::52a (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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827036493100001 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 Sat May 4 10:05:49 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 1641827067546152.8418742491158; Mon, 10 Jan 2022 07:04:27 -0800 (PST) Received: from localhost ([::1]:47100 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wDi-00012u-0z for importer@patchew.org; Mon, 10 Jan 2022 10:04:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqt-0001vs-Jy for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:51 -0500 Received: from [2a00:1450:4864:20::535] (port=37733 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 1n6vqo-0000Sa-Rz for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:48 -0500 Received: by mail-ed1-x535.google.com with SMTP id o6so54496494edc.4 for ; Mon, 10 Jan 2022 06:40:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:44 -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=ASufLHP7AdVfYvm4LxgmBtx1BdhYYVtnnz9r15dRExE39ihcs7HRkH4mD5XxhJdCRW RU+sobn2ea9iQqiLqCIWDIlQlYqwOECWkTVQzfbyD/tU3avf0A3le75qfIYMlV9tf0r1 RgtMkF4FgkUz6n1RnWi92HmCK17MmC30fay3KD78fvKDNkov1Jfr3KeFnFrLzR4dazjL wuiw45tq20vHsZzYkOSd2ZPFymMR0nyNyhRJClCQmMUw4UIGcaIACdrm2Fw2tH/RK9SX DbEMisFjAbGjdJRvj0I2y6Rj1TgM6COoZpVSohkZ7Mp/hoPFCWahyxlYn+f+Ybv99kMn MzbA== 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=ST3zDarwGWD7GTiwlRD3a/yzThPc+EzQIFeeMiHGYDjkaVdHwk9WttL6OLWqeX0Ef8 /LP5+sNGZjNvKSNH2aRQCizhFkeOw+CXsK6MiKyqGewiWwHMo4+E3o0C7HWdAJ/fEKNT N9roGbyHPWfuSMRFo4BxX8s7x80jYjB0hEQybXnxOIW1Gwbpm1rOK3ZvPq7WxvDfBFRA 8wMc/tUwwVk99RA3Qy+izfaJSuuby7A6V1Fxx+LfMm97OECSsZInJw+RIcY6NWORuzmu stKKCrbSR2u/uT0kUvByBhLSwFC3wBCmWg8sr7/HaD5wcfLhAxSeGerzsGN24J4IT3Qy XxGg== X-Gm-Message-State: AOAM532tgRJj48a3ilhXGlWMkWvufjl/8x9YMLx58gFGFHNKir+El0bC D/04S7IPIGx278YUhmgD+dfWHD4twXY= X-Google-Smtp-Source: ABdhPJwKhexQJTeEYNAg5x/oZFSzvXhGzHTOomrPEgrdybrvRNSva7aYc4GeLs/JP/OwOyKIml7q3g== X-Received: by 2002:a05:6402:3584:: with SMTP id y4mr4341772edc.232.1641825644374; Mon, 10 Jan 2022 06:40:44 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/18] meson: cleanup common-user/ build Date: Mon, 10 Jan 2022 15:40:19 +0100 Message-Id: <20220110144034.67410-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827069719100001 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 Sat May 4 10:05:49 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 1641827256898734.0030251828279; Mon, 10 Jan 2022 07:07:36 -0800 (PST) Received: from localhost ([::1]:50782 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wGl-0003eh-HX for importer@patchew.org; Mon, 10 Jan 2022 10:07:35 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55336) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqt-0001w0-Lw for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:51 -0500 Received: from [2a00:1450:4864:20::52e] (port=40734 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 1n6vqo-0000Se-Sa for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:49 -0500 Received: by mail-ed1-x52e.google.com with SMTP id a18so53406522edj.7 for ; Mon, 10 Jan 2022 06:40:45 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:44 -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=T+4QuvGseB28cC6tFL3aJUljbj8vSI8TanuVHQ0gBAnK8VL8+z7Ge+A3wvDqjYOjql LdM8jVpsPbpmBhU2smRIzvn0PWuj0t1VE+2kwQI55NLxbReWkFiTBv5FSS+a1A8nyohj 2HXR3SsAe/HvzhBu9ZUxq+VQP2TZlgphf8wqpFOF11dHTo5jPoReWv4aU6SxNd3chOsM f3J8lU0J8I8IrkiQqj2QTBhGFoqn9/q6+Of0BKrS7cPs2iYHe2+//STwmPPg1ZdtyK1k evlfSSQy9OPhdSgLNO1GZFjYcWEGJp8bzV8+xT1H4eVt9cVqzUUSrVtnIOVMDLDBoss8 LAag== 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=nApjBz5gK+/w08RCVa2z+ABrC1X0OIM51qLzund0EFY93IY1s25uhm3SJE2bfmvrgE smJcy/zJX9noFIjsKg0d2rGp1OKqrzuDvOEx18MaQjLRHBsZpNy3eoIiK7medzEDHEZh cJ8kcJiQxRr7HAhuqD9zrr+uhEETQ1dUWLe2p4IEC8xFJWUFf4+xWcb/iIyuFm0G5nuo PAd+0tmxgnMe3BDzppZ6KJlrSRcHsNuvv2t6CVj4QzQQ13ri+y55dke512KNDdR5LYh4 5unMyLJFSWsACZ8VLoIAR3EWwmbyUVqFrfg3f4Sy1S1rfGTwzazZhMm9F3S8Xj4DaQMN 8HHw== X-Gm-Message-State: AOAM533sVVJMFsRDb2R7RhHGX/X6wmuD5/Tdt1WEhCYDWzwN/w83iI7z NGoASofcUxntulwOgIKS9k7M5nRgcX4= X-Google-Smtp-Source: ABdhPJzk/4DavMCnwGFsIYOfZqpXMngbOX490eJfiL9tcmvo7Qmlg98di7X8Q0O9PotIcyHbgmazJw== X-Received: by 2002:a05:6402:5202:: with SMTP id s2mr67936473edd.206.1641825645092; Mon, 10 Jan 2022 06:40:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/18] block/file-posix: Simplify the XFS_IOC_DIOINFO handling Date: Mon, 10 Jan 2022 15:40:20 +0100 Message-Id: <20220110144034.67410-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827259253100001 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 Sat May 4 10:05:49 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 1641825864206392.8608746183846; Mon, 10 Jan 2022 06:44:24 -0800 (PST) Received: from localhost ([::1]:34320 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6vuJ-00052p-7G for importer@patchew.org; Mon, 10 Jan 2022 09:44:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55334) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqt-0001vz-Lr for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:51 -0500 Received: from [2a00:1450:4864:20::532] (port=46760 helo=mail-ed1-x532.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vqp-0000Sl-07 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:49 -0500 Received: by mail-ed1-x532.google.com with SMTP id k15so54277604edk.13 for ; Mon, 10 Jan 2022 06:40:46 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:45 -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=ov1ozqnlCtxpUjkwYLA+spiskpMg2mlrkuJmq80GAzM=; b=AuesgVZJU1dfVEZjLwCYao6ykkn9nUCUkQDaDc0tsuz0ebwDx3wNzYMm3tlK7HHWUI axLHa2nrQeOU2QTZd67iTO7SRnqlbwkkprQji87njoTSCoP/NUcfzvC3ORa4xiGxL2wi MGeMOWY43nu3iPx3kgfdKkPqDiLWlityDIkZTyN58CXwRvO6gZ3+Db73LDNVs/+FJycy vI8Oq6mE5kWt1JND9xTCUyqaQXEKpnbcmvvouu7kv+o1Nb9SVhxt/l0bOVCr8XcDN5sj dlDNJG3r1hFBIqPXMoUzxh/bdAezh9WIOv5IeuSE909SIEXbo2HKGu1CdDWlWbzG+6FZ ONyA== 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=ov1ozqnlCtxpUjkwYLA+spiskpMg2mlrkuJmq80GAzM=; b=JFZ4x8kFMvLKcTnifMgM6Zp93jUztYSAi5AfnMCYBWSjfhG5dV3nRxdrfyAZCljhJO jLC2kAoG57AhZ0pFqPYtsLujoSeCMR8VUNP9kHWo8LJ7yUmT2krqa9m+SnD8ZHNblNAK s9HwmIrFs+OWYZY0ejnxe9rRcOLv9b3xIY3iuhhoCDLUtqH8Ak76C6BKgFkcUAf87QHc VnUSDfSUhXgtwK1HxsDtgXTfeCi6QRdUu12IRpZatKG6jX+rxOV7MwpDPBK1PEb8kSI8 i2grGgqnHheI6VCVgrl6CrDmZ62ltsolgv73rFgmd3rJ3XaPJIBZ1M3KA6T05lpZ/61v 5nmA== X-Gm-Message-State: AOAM531zsnJlCgzb3vvoug8odRwo6P+o0pQjT3dX4F24vlqt9vJAGpK/ TnZu2PeFZ5G2hCSCv2qFZwyJ9Sp+ZyI= X-Google-Smtp-Source: ABdhPJylyt7MopAfRyQVP0FRNKdoB+p1WjSNZ7nbHl44uTev7LZ2GwWiVTgpzn+xrhf26o9sphwurA== X-Received: by 2002:a50:fc8d:: with SMTP id f13mr1710893edq.279.1641825645685; Mon, 10 Jan 2022 06:40:45 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/18] configure: simplify creation of plugin symbol list Date: Mon, 10 Jan 2022 15:40:21 +0100 Message-Id: <20220110144034.67410-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::532 (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::532; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x532.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641825866367100003 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 | 81 +-------------------------------------------- plugins/meson.build | 13 +++++--- 2 files changed, 10 insertions(+), 84 deletions(-) diff --git a/configure b/configure index 3a523a3d14..1b5fa5ae93 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 @@ -1696,6 +1695,7 @@ if test "$static" =3D "yes" ; then plugins=3D"no" fi fi +test "$plugins" =3D "" && plugins=3Dyes =20 cat > $TMPC << EOF =20 @@ -2317,69 +2317,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..fa12047327 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 - plugin_ldflags =3D ['-Wl,-exported_symbols_list,qemu-plugins-ld64.symb= ols'] + 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,plugins/qemu-plugins-l= d64.symbols'] + 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 Sat May 4 10:05:49 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 1641826201384350.4570281504707; Mon, 10 Jan 2022 06:50:01 -0800 (PST) Received: from localhost ([::1]:50970 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6vzk-0000FA-Bo for importer@patchew.org; Mon, 10 Jan 2022 09:50:00 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqu-00021f-UM for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:52 -0500 Received: from [2a00:1450:4864:20::52d] (port=34647 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 1n6vqt-0000T2-Au for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:52 -0500 Received: by mail-ed1-x52d.google.com with SMTP id u25so54502513edf.1 for ; Mon, 10 Jan 2022 06:40:49 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:47 -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=ZGMvmwi4ckE38iut27TXSJpJDVCHdzkEy050+pNb4pI=; b=FgkMyDWqIjQ/BmTK9It9gf3Mda7m1qPperW7InIkBB3MjIRt4S4yuHSg3rNT0Jule2 h9ztkWP44z6TP7awoZPGSQg4eThRJwssoi9W122jho+cMbBFsN60nmoBuJVnqtZ7b/L/ wjQvQBbkq252KNKEOZByW+B/iyOCV61jZpkAfiV/bWCX8zRhm7RInT3E69jlNkWSvWH1 yjIR9oUYxNPEzs+xxoZTooeKkvpQEKYVzLJSA91r4H55w0Jv5W0fJeUK0Hx32RrX356i IqBH7xxwU3Mz9Bw92+pxBP1MkjO335ByrkJeL6gZYP330K0H91eLv4+ETzVXFNw7/Rn2 85lQ== 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=ZGMvmwi4ckE38iut27TXSJpJDVCHdzkEy050+pNb4pI=; b=EhfWhLuAus+Sk6r62w1Q3Ndccz0irP3flV3AVbFzrU4iAVlulysmcAtA+85FeCYyBW 0MAdZdTMt1WWiejgsfGdtT6ILQa1TjoTt/hjgmfIc5+ocdzKOVU/LzqQiiD4JeWQ/x2V Cut7S3HvwUZCDHQls8KYiiGwOTDkuVETtfNVdOsf2Zv5RbkM3kyWGspsNC2mE/Hol7Zl yIm0PFcmImPWknAtcFL26/fxhCtFakVDn6N6KkUYU+tMkGAYf3vuO9806edbm6wpvzr8 7Jtdj5qTW/0Y6g8uQRGpgZWsCTOIv5EfJ0QFggfuGrITIas9RlrKmyVjqimFgQSEDXAj zhEw== X-Gm-Message-State: AOAM530oca3U1z/cr1/e1wthGZkXbR+/bwQBR22L7OR0XGy83tDy/CW0 JNlCCYMVWesmA9uFaBNHZW4Zcd8tlfE= X-Google-Smtp-Source: ABdhPJyiJ/K9CAEhwvchTdMR6YY4F2uBC/ocqwbmh4dHrhZ//EGMVMPL025b4kvXHp7STKe+N/a4XQ== X-Received: by 2002:a05:6402:31f0:: with SMTP id dy16mr7121932edb.364.1641825648186; Mon, 10 Jan 2022 06:40:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/18] configure: do not set bsd_user/linux_user early Date: Mon, 10 Jan 2022 15:40:22 +0100 Message-Id: <20220110144034.67410-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641826202712100001 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 1b5fa5ae93..f35d3f198f 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 Sat May 4 10:05:49 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 1641826483742705.8089164278028; Mon, 10 Jan 2022 06:54:43 -0800 (PST) Received: from localhost ([::1]:59914 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6w4I-0006bH-Nl for importer@patchew.org; Mon, 10 Jan 2022 09:54:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55360) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqu-00021q-W2 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:53 -0500 Received: from [2a00:1450:4864:20::534] (port=36664 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 1n6vqt-0000T6-BB for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:52 -0500 Received: by mail-ed1-x534.google.com with SMTP id 30so52820371edv.3 for ; Mon, 10 Jan 2022 06:40:49 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:48 -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=yvMthZElZ4YxiJxc6dcCrsKO7zA6i6/j/5QIhBOtySI=; b=l82y339lWW2O09dJ6JTO6iJw0q8y/QxnLXuX+U1JmJS4kjRgM1rhEwVZCpBs2fNU5M ZsHmOP0T6/OoBzP4HA0ryj1DLIzsBihElaFc6JHMiKBd2Eit1WFgY4tI/Dozs1S8F+oU bIur9Dh4nVE2w3Vd/VOAaf/ZTYawwnvYrGSfftw5JbpsKUUHIlDdtGA9LG1rXeh1wZGh vHrjiLyorsBceky2iqJQmlyxF6ysJaIkwyY20EiY0MQywQQzDM88/e8mYmUXBFGHSl23 MdilqammoQIu0bQQo8QZ5pdBLY0ogM/F2+/r/0KX0XXBXRrhrR34ROeE177FTwEix+KQ 1cIA== 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=yvMthZElZ4YxiJxc6dcCrsKO7zA6i6/j/5QIhBOtySI=; b=f0prseE8oUITKTM0+YGF2TRTP4Vv6uiil4z5cdSn0YZ9wqLK4zmTf6qKCxyV7Rua1M 2zfbMKS1zh3N25orGpbG3tqfESRuAwT3+kzgn7IKuPGYXFaTEhOqiXmhBqdisojEYuYy 9alCbNqrJch9BSzv3skxNgPDfaNAojNVMXkE2r+Dorvs+VOBLuI4Xv8PYvW5eRlNAjvi KNwOBZ9NBXvPavtSUVmVtB9N6ICu+M6XpKf7C1cyRgN3O+S8p2jYkSndiMkRQPGiavt4 jzdFjVUKPgPzLYMrkx1oyOv8abbMPsySdXdS+uEgfWRx1QSShmQ4o+2VaIZOTou+2tm8 KodQ== X-Gm-Message-State: AOAM530RphuEnn2AcpV8BQoV4rHtwsn7zjcWvFesrbXgnd6CYvfkMGsn pOmRq3TaFuQXg2wBKLXRBTCYKlhyCaw= X-Google-Smtp-Source: ABdhPJw50NU2plrVTdOUwH0onMzirC9EM+rQL2kMrTxYgG7PEnNcIUVHqtI0iwthLYBEAIv561RvmQ== X-Received: by 2002:a17:906:7315:: with SMTP id di21mr51628ejc.700.1641825648893; Mon, 10 Jan 2022 06:40:48 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/18] configure, makefile: remove traces of really old files Date: Mon, 10 Jan 2022 15:40:23 +0100 Message-Id: <20220110144034.67410-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641826486247100001 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 f35d3f198f..a02febe09c 100755 --- a/configure +++ b/configure @@ -3672,9 +3672,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" @@ -3686,7 +3683,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 \ @@ -3708,11 +3704,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 Sat May 4 10:05:49 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 1641827466768195.98399772860546; Mon, 10 Jan 2022 07:11:06 -0800 (PST) Received: from localhost ([::1]:56114 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wK9-00082W-C3 for importer@patchew.org; Mon, 10 Jan 2022 10:11:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqw-000278-H0 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:54 -0500 Received: from [2a00:1450:4864:20::52f] (port=33570 helo=mail-ed1-x52f.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vqt-0000Uv-TP for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:54 -0500 Received: by mail-ed1-x52f.google.com with SMTP id b13so1094886edn.0 for ; Mon, 10 Jan 2022 06:40:51 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:49 -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=aXyUMyG7vbgaYYighFikjZCBWMIv2oSr8qV4nvQV9c0=; b=Yg7Lxsig+MbizAYxL43/K2tAjqeiAqxXkm7LVZUiNkvz+OcGFDfH9hwNLchs14d2Td 6L4QLs17vWYXgZRAKWirQMGzqeqwVLTpPhZhZ7orpzVKc1WdBI9rHC5C0fFBTtmCp9Rh 0445Q7B0Y3lug81OEI3RnTcXdz/PYK51fIn3a/BAQnpvD1fHLAstTuIxEKvL5j5dQkav xQ+myY/kKcsQMYGHqtk4hMbW1CkFchIe5vpyGyaNYX8yI/csSzJnWsGAwcP50eSLA+cG lPUavKvRHPHC39RJHlzmlr/L4rMlKd/RJLP55VfstS+NoSFhLI4sfdvmzyG8a3stkFZM rI7g== 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=aXyUMyG7vbgaYYighFikjZCBWMIv2oSr8qV4nvQV9c0=; b=gEi2va1V50vzKeZzTyRT4p9dEz94BeKS/wkA32qzcmP+4peygq8ZC1CV1t8b1xJFGX mHuQDZrynSVQYjvvVYfhIloPGGMC9fpWTVo9Z4w3Owx7SWIfq3rszaDbiS8yKcVDLTOx iwaM3L5xDi+lqAQovaf6EgRPzGnp/kmrfqIMHf25GWwqHYy/0OPPkC0J+XkF240ZriL/ HGsN3BNtdoVfUSQh0V1R2usXgwOhtwN6x6LytZFQ+fZWnSbpgB1qog8WXq7xmOi22bFW gL6l/g0xHOpLDruiMXKbqAWZFdhnhh+MgzS+pp2PKAWBLueVuPIUoe8lw2AZnK5S0JG7 2s2Q== X-Gm-Message-State: AOAM530B7Stbwk+MQisAOvyx5KGBNdju5gfSwMfuq/mZlt1OK674I9NN fqkB+tN8UoBveT6U29WoXdZYzimRgOs= X-Google-Smtp-Source: ABdhPJw719bIeDKK4WrbQCw8zUFgOhSOghzqEXXWPv7l61K0ILc7n3S6j2JRxjr3N594NrAlgsJgIA== X-Received: by 2002:a17:906:58cc:: with SMTP id e12mr19421ejs.755.1641825650505; Mon, 10 Jan 2022 06:40:50 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/18] configure: parse --enable/--disable-strip automatically, flip default Date: Mon, 10 Jan 2022 15:40:24 +0100 Message-Id: <20220110144034.67410-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::52f (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::52f; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52f.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827468319100001 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 a02febe09c..be05bcf856 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 @@ -3315,9 +3310,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 @@ -3595,6 +3587,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 @@ -3812,7 +3805,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 Sat May 4 10:05:49 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 1641827286677379.67181334394013; Mon, 10 Jan 2022 07:08:06 -0800 (PST) Received: from localhost ([::1]:51660 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wHF-0004Sv-K0 for importer@patchew.org; Mon, 10 Jan 2022 10:08:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqw-000279-HB for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:54 -0500 Received: from [2a00:1450:4864:20::534] (port=40742 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 1n6vqv-0000VJ-0c for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:54 -0500 Received: by mail-ed1-x534.google.com with SMTP id a18so53407589edj.7 for ; Mon, 10 Jan 2022 06:40:52 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:51 -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=088450L/bqlgI6yAPA9NTzKrp+4+h6Tn3SpFF2ftbfc=; b=Wra/+0TOMgvBMf3nwp6wlZt4r/fvuLO9ObnztBTPK61GZOpRtwDLlY2/CYa9IfH9kz Y4DMBPx9L/WRyTi8h0RnyU5UnM+qlKMhPYY9untyjs2UgJYnVjr59yqaUg1Cc2Lx85Xo pGyQq75j15vmwm9ngJ/6ABaXh07ZWkEiKuvX3njTR9jja0gWDWxgo+S8sCudyTfOhg9O tyRoo5jAiRSZc8mCl91GnGxTD5sISOq/eOtJbtfI702TnXpgIivG+Lf890Yr1Jw3f8XN jXGesfca+XJTMreMuNjqw62FxdL1erA8VYKlWC6x+99qEd/PnvACqArfYBrbqozXuEHi Ab1Q== 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=088450L/bqlgI6yAPA9NTzKrp+4+h6Tn3SpFF2ftbfc=; b=uALkDH6NCRI9xPxAL13YKDoJHc60ulrRI1nboLLJpcJfiHw7xxD25oEC3lnOHwkllk QD2xz3agoOayo2d/9z0mhtUzm1NLhAjds0rwYhP9xAc9kfZMKswMHqBc+A764CSJQJBr hUaoRwqQUPP6xDmajPtQ+T31aMbqA645ZPZqCWad5H1TPZfG2iX893CY6YrzBqiqQcRp a03EkWfghYrc0ezgDWRni2kWMmWHKcpNYzleSLTLWSN6btEWoJ/9GgMzzXl+kHxEaQmh YX1q+id4f5riRYwVol1lyUy2EhjgPho2uVhoL7tSk8uEEoBNIEHqAvncLGOV3g6STCoD pPuw== X-Gm-Message-State: AOAM533Pt+ONgxGqj+VdAiyS9sfb10TlJ8A2JB7sWCNNTFBVqq+Tqrg8 CT/MlP+ytZrkj4v4BJk/vK2wFfjXkuY= X-Google-Smtp-Source: ABdhPJyVV8cqUfg8XuBPOwTKkwFdlG/Tfxwt+x3Yl48azE9y0CPeCv4s/ibK7GsfO0n8ZaClfd1KHw== X-Received: by 2002:a17:906:14d4:: with SMTP id y20mr60769ejc.454.1641825651743; Mon, 10 Jan 2022 06:40:51 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/18] configure: move non-command-line variables away from command-line parsing section Date: Mon, 10 Jan 2022 15:40:25 +0100 Message-Id: <20220110144034.67410-10-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827289002100001 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 be05bcf856..56c113bd83 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" @@ -2549,6 +2547,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 @@ -2579,7 +2578,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 @@ -2606,6 +2604,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 Sat May 4 10:05:49 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 1641826034968495.5316744878868; Mon, 10 Jan 2022 06:47:14 -0800 (PST) Received: from localhost ([::1]:42732 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6vx3-00032t-WF for importer@patchew.org; Mon, 10 Jan 2022 09:47:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vqz-0002GD-5z for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:57 -0500 Received: from [2a00:1450:4864:20::530] (port=35475 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 1n6vqx-0000Vp-Ie for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:56 -0500 Received: by mail-ed1-x530.google.com with SMTP id q25so45825323edb.2 for ; Mon, 10 Jan 2022 06:40:55 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:53 -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=nSMJZeF04CL0jhk31BFt+AembdkvwRk+/RHiP3Z1+Al8hUrd6IYFPjPkVU9cwx7gNg YrBxXw5Jk8AfihPz9HrJWLqdOn9CVMUI9xM3BHtjKtUqNMx9N4wBZddUtrSwzJgAjRb3 /SDne2fNoJgw3ry7HqYShM3b+2De2BidqFr97RbHPr9O+lcWiyJunDff0Eu0Zs0annjL grwsYbXmELAc5gghXoUB9BlZeFbiymMnC2g33GEWEetyLrhniNm1NtajZTqIO0krqLiO 89jWQLuxiFnS6+CyLn3qDiisH+sRJCPvoHShLKDZQJg1u3YYkPmvo+Betp/p4zu6bVNu NLYg== 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=lSip+FlnQ+B9X3g35hyPHPS/ufUfmO4l40TcQgsuh4OCXqQ3Lb3QOWSGMhb9SxMKQd uSd5EMY1WKjlpphwRIF0A/WSbuymet47N7lALZeyj+VFWd4sKbxR35P6ryJxVhxJy/ET xPFjiR3WyfAkrpOxhHyealJ/PG2TbFeDqTy6t0Q/BepwjZZ31rRDsn7Y9OuJ9D0gG4JE mP/esfTaWEMGsX0yqVp7k/nmQsVFKt0xT1hcPy6c60UFFzmVheth/7dftFfVMlQ7XI+0 Un+vlIPd20Zzni9fbzFrBYn3gTzzjSOpcC0U6whZ1VGtlWUx7nCyfOkViJl5YNU+rNfN AAIg== X-Gm-Message-State: AOAM532d6Bd0haaDT9oYoAi0grqE1vzSJ05sXIDGB1OocLpmrlxScryg /ieKV6CXtU7W0CObPMFWi0/Zc+q1XtE= X-Google-Smtp-Source: ABdhPJyMim5QtmhHqxRcNn0ErQeUKuuOKZ2egi/e1D9nIkQu/c3oxqkkx9I10vX4QCCcxeD2dqmZUA== X-Received: by 2002:a17:907:3d88:: with SMTP id he8mr40492ejc.241.1641825654325; Mon, 10 Jan 2022 06:40:54 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/18] meson: build contrib/ executables after generated headers Date: Mon, 10 Jan 2022 15:40:26 +0100 Message-Id: <20220110144034.67410-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641826035532100001 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 Sat May 4 10:05:49 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 1641827476510557.082898491772; Mon, 10 Jan 2022 07:11:16 -0800 (PST) Received: from localhost ([::1]:56720 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wKJ-0008VL-IR for importer@patchew.org; Mon, 10 Jan 2022 10:11:15 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55426) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vr0-0002MI-Qv for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:58 -0500 Received: from [2a00:1450:4864:20::536] (port=40746 helo=mail-ed1-x536.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vqz-0000Vy-5J for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:58 -0500 Received: by mail-ed1-x536.google.com with SMTP id a18so53408339edj.7 for ; Mon, 10 Jan 2022 06:40:56 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:55 -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=YFWh1/aUGnhtQvWNSPmrQpsKEyfAJp2BXqiV0h3xjk8=; b=KArp8jIRDSfXy9nNgjNZRT86rSHQhAT6Q5xAfnGklvxNyxEdhBu9Jh3M634267Fh0x MG2BHB0HJQ2DOYl7rjHUn8OH6ZN6HYDaQYcNGu0gm96nuTgJIrcJORKI/QqcuB485wo/ qVlpg3pZMun4N7AfYEnLMD//bWczHOqtds0bpyReolmPEgxYC9gCuxdhPd/2G9lsnQSc YmPuJyaJUn7RBoZoYgMx03lKwAtsoxfWvdIr5Lg7Kt9fcmZcvnFIsseyuZYmmTBfyPg8 0ThknhMy56feaSbZaLxQUfzpseLoI05E6AaRJ8YO1597WPJl5TIGz5kpxmd1bMeNuv2S 0BDA== 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=YFWh1/aUGnhtQvWNSPmrQpsKEyfAJp2BXqiV0h3xjk8=; b=iBM6KE3kospLEZdXBL/fh76mEb6xtUXIhjir3/Ecre1er6b8JGfhO7MzbUj5YLG6gI lUOJpfG7UK/g9BOUCwKpdP39hUEdGH7SL9K/0uJ4DKRTfUZzlUd24u9z9dc5X2W5kwHW 7CGH62yQeFE451FOaLbdLraqWey+6KVm0FGKwnt34FVDYzWCdtPJzNCSbs0TKHGXa+qq RlDpqkGq4ownT5W0u3F+gg6JQYEf2skJc9/s/QyaPSp2Z7Fk8+OLwUCZ2A2Idm7BfabX db++WSickPYkTywdTqfkxfxIsSgpnAXxHz3Tj/AzNO/eVDQw6DP51ROgmJw8kJC4hafT pknA== X-Gm-Message-State: AOAM533MrP5WxHW0NC/1cPtdGPmHawVlsVKUA7TTrLr7qo/dvrhaZlxP BBZFH5YZCXTzpSpgbzKrTGejS/c0rRs= X-Google-Smtp-Source: ABdhPJwYL6J+/dGBjvEMhmURz7iTOzWLMfjYChNqr1ywkBCX6AUu5mA73pj+Sr8IAGQOeXXCki/1PA== X-Received: by 2002:a17:906:7305:: with SMTP id di5mr39535ejc.255.1641825655873; Mon, 10 Jan 2022 06:40:55 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/18] configure, meson: move config-poison.h to meson Date: Mon, 10 Jan 2022 15:40:27 +0100 Message-Id: <20220110144034.67410-12-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::536 (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::536; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x536.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827477192100001 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 56c113bd83..0026388343 100755 --- a/configure +++ b/configure @@ -3834,17 +3834,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 Sat May 4 10:05:49 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 1641827602325276.60578287751275; Mon, 10 Jan 2022 07:13:22 -0800 (PST) Received: from localhost ([::1]:60376 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wML-0002ho-3c for importer@patchew.org; Mon, 10 Jan 2022 10:13:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vr3-0002Pk-8b for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:06 -0500 Received: from [2a00:1450:4864:20::52a] (port=34648 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vr0-0000WC-Nc for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:40:59 -0500 Received: by mail-ed1-x52a.google.com with SMTP id u25so54504283edf.1 for ; Mon, 10 Jan 2022 06:40:58 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:57 -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=lhiTo6HprJxgJbrP3KGandBTZZSQlCiy9mBKkm3yqHPo6bLFFdSf99+sHnc+Px9bi4 c5V7tFa8QCT2Y5JVYIeZNplktM7/280CL9GmzK3xaN3N9ZQucUzDO8qzBYz8FwPqAUwj xKAI551EcSc6rwqgQ7+oCoQcDBUIWUicydMYVQGwLkLlDXZjf6s17/6Gytx6Tc1XpOpG GZ12j4CmITCGBd8j6QEHFYdqqBaE5gbFC9JCo6UyWrnq+FmVYUr6BDo6i7nuLwjG7oWJ zE1aLZIFB4zNeKc36XAfv0MT3gx4fPgLTuvJv44cDlxXYyS06ukXGZjhSsiuO7qFvzxt iQVw== 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=bPnrLqTMbPHMM9SPVcQSfAjtxo2eUiM4fVkHUFarH7ScFN4Ep5vKQU8WcqpnqRshHm VEKvRawxxC4wcursgw/fY46pmNB7/jVSK7vUbXNVqMKdBZnTs1PCGFfQOpABRAjmR9RG ioR+3aqfoohACThaeDtOilMQxJyYGDEZAt9CkHIDHWfZrmbe3iTnRJy6W/dqafFUM9zr Wxb9i6mPKDJSZ4YiQguiUV7/SvFT2K0z+hVb8t7tKdgEZHpy9QihCCK1FkPd2y5m+cPb fXbOn1qDEn0y9dVAT35IGCaaENR53TPw0FmFLwFgeUqSPxT6hWT1cFd55bEJFRSRfv4y zwGQ== X-Gm-Message-State: AOAM531xHpt5LxjRSbInBMd6/lwvrjBuEQL0HKXAu2k9TO2VM4PE3Ltp S9swje6EsRUxrA5UQccah5nloERjDJY= X-Google-Smtp-Source: ABdhPJwu9hHsZzOC2dCcgTYz7u5ESE3Kq3oPz5q6ModDfgaeZFOxpKkCKUEAWhV6KU23PF/Q0XXUlg== X-Received: by 2002:a17:906:ce44:: with SMTP id se4mr41822ejb.209.1641825657547; Mon, 10 Jan 2022 06:40:57 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/18] meson: add comments in the target-specific flags section Date: Mon, 10 Jan 2022 15:40:28 +0100 Message-Id: <20220110144034.67410-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::52a (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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827604338100009 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 Sat May 4 10:05:49 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 1641827813748515.4366864976998; Mon, 10 Jan 2022 07:16:53 -0800 (PST) Received: from localhost ([::1]:37558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wPi-00072N-8H for importer@patchew.org; Mon, 10 Jan 2022 10:16:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55482) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vr8-0002T6-Gl for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:08 -0500 Received: from [2a00:1450:4864:20::52a] (port=33570 helo=mail-ed1-x52a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vr3-0000We-5Y for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:06 -0500 Received: by mail-ed1-x52a.google.com with SMTP id b13so1096711edn.0 for ; Mon, 10 Jan 2022 06:41:00 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.40.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:40:59 -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=FcyGYRHQSW3wZJqUgkH8WBVOpVxyZ5yNz4bWp5yShzgjn+g6pJT+XpK+d8jtdUPk6C MTxJMIwTOxNCXN7BuNP3gONaytR2dgJQUOaEhF/4YsDCmutwfHmbaZ7yMpMF2JoRoDuF a2lCvyhkeNOZWgwEh2U853KP9bsbRF+fTR7TdMRQJgs2avr3R4ggKN65gyDWB2wst0UH WspfscAWM61fcDXWoLFHodCkduyu+qN6fgtYwjUWej98s3RqbzAfgniUdiCQ+CDPFNJE 1oapkqD/2rN+HU5W0QJl/mAfykdql94qvWzUeZdtakeQas9emdLa0uEGOoEcyY1mAnRQ /suQ== 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=g/v/vyR2KjiivsLtRPumz1gDXc0BC4duU7vB7rGVlcsSdxZivL8EHAEvqTB3VJLJAV Y9w5Xr6HX1YNjqIC4HODU6JQ0+qtDqHmzIbkClPQ7dOIJ/ClK3baZHT0xoM6TtMHKiAA OD5STr2S4KjJh6rtM6f7PHtjUCIH7UIPHkSlufLuj2KZ9BSMEGewfY874YiBFRA9tZwZ oPn6cW925yCLCM+eHsSDxcmMlg8tJr5m/kJpiJd0Dyn3EOJCcSBaCa9FSClUBldNKmDH TGS4DpZqSmdLEJxsMlgzpiGa0YTrj1yRavG7WqK8/bKFZXHX4bHFodzZ8Nr+u1a8kAM7 KTUw== X-Gm-Message-State: AOAM533p5tViDSprpfdeeTUPeXL+u258LTfLxCVDfggY1x4+SHUa7Z6x 6GhycPYNvgGydNbYYHN1eTcnKLaZQ1g= X-Google-Smtp-Source: ABdhPJzAr/LdMsnZY8e7WZNjIkuO7HDqLkvXCHg4nH+3TFCa6a2NGGAQHFHpfjkf2M/LBwPPpPaOOg== X-Received: by 2002:a17:907:94c7:: with SMTP id dn7mr59874ejc.470.1641825659858; Mon, 10 Jan 2022 06:40:59 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/18] KVM: use KVM_{GET|SET}_SREGS2 when supported. Date: Mon, 10 Jan 2022 15:40:29 +0100 Message-Id: <20220110144034.67410-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::52a (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::52a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x52a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641827814699100001 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 Sat May 4 10:05:49 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 1641828102597748.4520568040712; Mon, 10 Jan 2022 07:21:42 -0800 (PST) Received: from localhost ([::1]:44356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wUP-0004E9-6y for importer@patchew.org; Mon, 10 Jan 2022 10:21:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vrL-0002ha-W1 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:20 -0500 Received: from [2a00:1450:4864:20::533] (port=38642 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 1n6vr6-0000Wj-O7 for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:08 -0500 Received: by mail-ed1-x533.google.com with SMTP id u21so31872332edd.5 for ; Mon, 10 Jan 2022 06:41:01 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.41.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:41:00 -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=b+yIlU2vro7qRStLrKkw5s74hp2TGmjK5RBQM7UKCh9rDRD93xy8MRGkkwEbkvSo0i EjGn9eeu5ImPrZ+FlkXx0FLY0ET6eWczyT2+AkRyfOMXgeHmJLQbE/i9U9S+qcsC95d4 Z5seo6zKYOXRS9pZa0oGAzOH6M2uEq5daPUdnYyEYqZWm+eL8xtm2ShlLLbX+t89hEkO /r/TbvWM/k2o82olCH7y1S/6l9OyFdjXhmwfwUqhELstGj+2HLLeKFh3Gy1dGkm1mzBG h0bBuPPVNhIW+yoiCJTH2110fKngNsXDhkNRExk7b+qQukvH89KHalp3tEpwHCFhTdKB /07g== 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=C9RT2KTax0nfom+HVu4+U/IEzEbY6+qiOV3L9mgdJpqHWyvJqIaEYXM5gKG9fVNysT 8UWKYeonXMrKlUK3t9DJtOxev0Rl4ddZcFUpYN2mq3vlyyAMJ9YfX9MgEr8KNzv5Wuax rUdxVtY6pdjo0OkNRl/wxpUkpC5xRCfGo5lhmVQb3UQA+HvkpT5qaidGfWpCf3dH70Dk o6XbWkaxWOtRx9Cunol3fgQMyrK31CZD6kz9REzmDqBw625e+NwY8TevxkWBcAuMrIhc Q6R58WMPI7oxzxjAQlAuleBJZXh7Zp1lh9fyW31SB/NPzGirwNfsLnw137EGmWyHvOIB ACLw== X-Gm-Message-State: AOAM533AkmACMkS1WPY+HTOug7cM4Z3QttkadUO3zv3OkSAt80TD8uyf tau6zLjw+2ePUEs+ZyjcFgR1aIAh0Ow= X-Google-Smtp-Source: ABdhPJyei0FUDVekI4z98+RgnlloPBD7nazFAZLNs0CMwpZ0FAd62OvboGW0/6B/gcHiQkbV/itOGw== X-Received: by 2002:aa7:df18:: with SMTP id c24mr10626811edy.164.1641825660954; Mon, 10 Jan 2022 06:41:00 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/18] KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS Date: Mon, 10 Jan 2022 15:40:30 +0100 Message-Id: <20220110144034.67410-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641828104475100001 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 Sat May 4 10:05:49 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 1641828222954579.3217239534757; Mon, 10 Jan 2022 07:23:42 -0800 (PST) Received: from localhost ([::1]:49204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wWL-0007gZ-Sd for importer@patchew.org; Mon, 10 Jan 2022 10:23:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55536) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vrM-0002hh-0H for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:20 -0500 Received: from [2a00:1450:4864:20::534] (port=41519 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 1n6vr6-0000Wn-OC for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:09 -0500 Received: by mail-ed1-x534.google.com with SMTP id t24so6624944edi.8 for ; Mon, 10 Jan 2022 06:41:03 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:41:02 -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=p+gX8PIrSdRz47V6vE4gbEnJaiA2G/ajdNmlUVCd5bGPq3YAzSh2A/SFTfgqDSfPLr uNZxgZ/S8/6zu/gNMuAWfiiNuHlBfs40Fvv7dhsdR7HtV0+dXR2Kifw6IUM8U1WSf4Ar +XIASrbcP4PZR0NQ+k8jpp7DM7WZf9ppQokHpFw0LXEYzRgHTjFACTkEyp9AxZ0aWi9l lreY8mmNCLJr8QYqetGTgRBMZPRl/wdd/mVzMUI+/MSbPpArdoFfalhM+0apeSWRWVvo zUnHH4FSbLh09jza1X8b0LvCBxCVhGjokrE6pCXs1aZNJnHxM2FlaYYrEaEWctxc6kV1 gvIg== 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=xSp+9PVuCyoSFKOWhknzhHxJ0QInvvOVZQDDr48kNXK+gOiweWcPeo3nezQkqVsGWD IuJM39TNA2JX/F+K3CSUcGv2DPV2CahXC06BZv0Vth00Huri3esED3yrB5NpJywcuqCb JsyNEFmCLtMMnjsy+2R76MVSty9jYni8g1SKu26vFytumj62GFTlaWrwvHcpJYkO2KUy 6uf8uwXka6GF+WpU/ybFPOzJUS27p81JqvScFUZGEtJGd1bLVvLwrkMs+tMXSDeapACF RH1f61g3kS5FPdhtuVr5e/fVZOOdzDWmI+L/w0qKvgvPc5xrp6veVpnM8jXaYd/8W2Xz v+BQ== X-Gm-Message-State: AOAM533YOWV5wFuMDsvsb3aEg0czehGm9VbMGTh67OtNPRBTIJCmW3jK 2OlUjG360lKd6YW9h0KqwEAoo5Ly6Bs= X-Google-Smtp-Source: ABdhPJxrRERGBw0PHEE+e+cdEKMGH/jD1lwu2nSyY3gPFizjcprKYbWD/sRSa18UBft6wBBjhIw+Jg== X-Received: by 2002:a17:907:8687:: with SMTP id qa7mr71327ejc.192.1641825663144; Mon, 10 Jan 2022 06:41:03 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/18] tests/tcg: Fix target-specific Makefile variables path for user-mode Date: Mon, 10 Jan 2022 15:40:31 +0100 Message-Id: <20220110144034.67410-16-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641828224241100001 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 From nobody Sat May 4 10:05:49 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 1641826204167885.4368192280836; Mon, 10 Jan 2022 06:50:04 -0800 (PST) Received: from localhost ([::1]:51198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6vzn-0000Oh-20 for importer@patchew.org; Mon, 10 Jan 2022 09:50:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55530) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vrL-0002gy-TT for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:19 -0500 Received: from [2a00:1450:4864:20::533] (port=45893 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 1n6vr8-0000Wx-3g for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:07 -0500 Received: by mail-ed1-x533.google.com with SMTP id z22so9372612edd.12 for ; Mon, 10 Jan 2022 06:41:05 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.41.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:41:04 -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=J8eMnnyABy7XSBsmUrNoL+ReTiqaDOWtN2nCCVFhCqs=; b=maJn0h64hjCQOoYqNgvGTbJna3KW3OvSf82LpnymGiKute+Ma/R/vZrAPpwQX9vknG RJMx0XpFPxfbm4FWakEZoRNSfsRfUJn3Cu3Gv48ZHI/P1fh2n+jKWjqixt22/NrYlfYK MAaDMI0XaJNFbJCODg1x1XWgDeThZmv6gWJCctG6TcfHV39032rckOrTWV7pHdT6M1nG IJC311p6tORy1zBxa7h4muEDe/zs2hSuy2Zi9dPn7y7crCh50k5feFnoEk83o8Ef8BBz 6WBRybKRObogbZWArj1Kk2j/Gbuic74pgQ+iZOKdqFmmO6KcoudjOqx01Km+y3Rlf/mD 1sBQ== 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=J8eMnnyABy7XSBsmUrNoL+ReTiqaDOWtN2nCCVFhCqs=; b=RyDtsJJ1wzSpJiurMwG1xaTjJZXWhUjTRhD0DLkcWtLmBaOTIcK1tgq4SfOl8Zte8Y S2lWFqHaitJTsdkzaw8ynRQpN+bVhcL8d7WWXz61woE0uE19qqjzzJ3l/0ckg6qwHLET SOwXCp85+CnvV2/dE7a/wQYXkEwRm8joDwTDtIL0fo273ZpdZCAhHqEDFih4NRz7v115 wcXOKe2ZyXJxE46ScKeXFes0fTGXCkEwmkDp4JAzvB/6OZfsHQMkVvDMniB6ZGQtZR+6 iqiZX0JQ/UsGNIwxurXTAzQpTPdZJFT+0xNNODxywgrg3ZAix7WNhjEToTYGBtodYtXq Vebg== X-Gm-Message-State: AOAM533OvsT2YnYooiv1XNl/FMQ0VrW4cDZJTw4rA1Xxh5+V6QCsxzry 2ia/cV2zVBqouAvE+gts4F+1exFM18s= X-Google-Smtp-Source: ABdhPJxBQsLlN3q3gLktbz30V0eyDGm30bpmR6VCZ14Eo8Mp/p3jIHv/TbxlZGD7N2OXreYTt8s9CQ== X-Received: by 2002:a17:906:9b8f:: with SMTP id dd15mr63265ejc.480.1641825664966; Mon, 10 Jan 2022 06:41:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/18] configure: do not create roms/seabios/config.mak if SeaBIOS not present Date: Mon, 10 Jan 2022 15:40:32 +0100 Message-Id: <20220110144034.67410-17-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: 1641826205222100001 Content-Type: text/plain; charset="utf-8" If roms/seabios/Makefile is not present, the configure script is not creating the roms/seabios directory anymore (commit 5dce7b8d8c, "configure: remove DIRS", 2021-12-18); thus, creating roms/seabios/config.mak fails. The easiest thing to do is to not create the file, since it will not be used. Signed-off-by: Paolo Bonzini --- configure | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 0026388343..e1a31fb332 100755 --- a/configure +++ b/configure @@ -3704,7 +3704,8 @@ export target_list source_path use_containers cpu $source_path/tests/tcg/configure.sh) =20 # temporary config to build submodules -for rom in seabios; do +if test -f $source_path/roms/seabios/Makefile; then + for rom in seabios; do config_mak=3Droms/$rom/config.mak echo "# Automatically generated by configure - do not modify" > $confi= g_mak echo "SRC_PATH=3D$source_path/roms/$rom" >> $config_mak @@ -3717,7 +3718,8 @@ for rom in seabios; do echo "IASL=3D$iasl" >> $config_mak echo "LD=3D$ld" >> $config_mak echo "RANLIB=3D$ranlib" >> $config_mak -done + done +fi =20 config_mak=3Dpc-bios/optionrom/config.mak echo "# Automatically generated by configure - do not modify" > $config_mak --=20 2.33.1 From nobody Sat May 4 10:05:49 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 1641826499408305.99806571692; Mon, 10 Jan 2022 06:54:59 -0800 (PST) Received: from localhost ([::1]:60010 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6w4X-0006fw-2f for importer@patchew.org; Mon, 10 Jan 2022 09:54:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55582) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vrR-0002lG-Ft for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:25 -0500 Received: from [2a00:1450:4864:20::529] (port=39579 helo=mail-ed1-x529.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vrH-0000XL-5n for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:21 -0500 Received: by mail-ed1-x529.google.com with SMTP id c71so42889600edf.6 for ; Mon, 10 Jan 2022 06:41:08 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.41.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:41: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=inTZD+4IypX7RqF+aT3fg6wUiP6db1LW/9x75xNzatk=; b=SFjZG3ti7zXbG7ROXYNan1DHMZarDOhXqe1wWIBV8nJFg0KUWS5DPK1HhsszImGTwP RhYYR6OG+nS1KbE2rNIVxMHbaihk4sJQJi2sm5X47GG7inpHb1A0xUujNSA+vdIiR3EQ gIawEw66hOzdV/vZA/Z9JZbfxsZfLT4dVho7U3oMJ7lqY861Vz2f6rtOZNQ2yogezoiS XegBZJZ40J6Wj603vNqLou0l+94IIClzXAp7ngd9ob2HMeudOVjJ57ReTgJNAqW8AX+L 5XE/B0c8/Wr0Dezm3ITwjoa1hJ1sh5yBY9PPV33GmswD9jy31g4VDWi1H9xsRcBvFUK5 wfIw== 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=inTZD+4IypX7RqF+aT3fg6wUiP6db1LW/9x75xNzatk=; b=Psar3dCFb3FjRhaBy+K2R2FF6sHUoQ3Iy8YYdL04sOch7ydcWq5TfK8mZa7W4anEPt dyKoPDtRJsszAZcC7nVGrYO6DNIn6V1mFWzo41Zny9YLas0xpX8K7FMDeMx4YPq3jAsI 0DLSDNm6ktdmfp4eYkvfVYfvteNBsW95OoUBF9wQYIZcZ3Snv7Hm5S47GKsN7fsLeMO5 HWoNruK93QmWVdBLeT7yCstwikBquOCKB96+Qs2bdAijknDKdTCuZbS9dfbNs9ikW+Nu GfTkhejLsiA4AExqJLfONT+Kjo8e7oOQNr/4Aq6uSrzzdUJnPZO5JYPKpznlcAgmFciE xUYw== X-Gm-Message-State: AOAM533dsjAMrQ7Bb4BqxP4IeJAWQU6B1Aic1S2pSj9bF9dxSx+wcfXM e32mTHj89TkC+t3q6aC/kc8gZtKqfuE= X-Google-Smtp-Source: ABdhPJxgBvSF/YiRjsmtpBqHbSqgn1L2VQn52ZyQHKYhYYJwLa10hcXwnm/R4bg/81nF4Y4+YTCI2w== X-Received: by 2002:a17:907:2d9f:: with SMTP id gt31mr57180ejc.544.1641825667566; Mon, 10 Jan 2022 06:41:07 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/18] meson: build all modules by default Date: Mon, 10 Jan 2022 15:40:33 +0100 Message-Id: <20220110144034.67410-18-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::529 (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::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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: Li Zhang 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: 1641826500952100001 Content-Type: text/plain; charset="utf-8" With more recent versions of Meson, the build.ninja file is more selective as to what is built by default, and not building the modules results in test failures. Mark the modules as built-by-default and, to make the dependencies more precise, also require them to be up-to-date before running tests. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/801 Tested-by: Li Zhang Signed-off-by: Paolo Bonzini --- meson.build | 4 +++- tests/qtest/meson.build | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 6489ff8425..703eefea13 100644 --- a/meson.build +++ b/meson.build @@ -2866,8 +2866,10 @@ common_ss.add(hwcore) # Targets # ########### =20 +emulator_modules =3D [] foreach m : block_mods + softmmu_mods - shared_module(m.name(), + emulator_modules +=3D shared_module(m.name(), + build_by_default: true, name_prefix: '', link_whole: m, install: true, diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 37e1eaa449..26937deb6d 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -335,10 +335,9 @@ foreach dir : target_dirs test: executable(test, src, dependencies: deps) } endif - # FIXME: missing dependency on the emulator binary and qemu-img test('qtest-@0@/@1@'.format(target_base, test), qtest_executables[test], - depends: [test_deps, qtest_emulator], + depends: [test_deps, qtest_emulator, emulator_modules], env: qtest_env, args: ['--tap', '-k'], protocol: 'tap', --=20 2.33.1 From nobody Sat May 4 10:05:49 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 1641827612360139.75491428400971; Mon, 10 Jan 2022 07:13:32 -0800 (PST) Received: from localhost ([::1]:60956 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n6wMV-00038P-CP for importer@patchew.org; Mon, 10 Jan 2022 10:13:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55578) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n6vrR-0002lC-Fl for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:25 -0500 Received: from [2a00:1450:4864:20::529] (port=38636 helo=mail-ed1-x529.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n6vrL-0000XP-NG for qemu-devel@nongnu.org; Mon, 10 Jan 2022 09:41:22 -0500 Received: by mail-ed1-x529.google.com with SMTP id u21so31873846edd.5 for ; Mon, 10 Jan 2022 06:41:09 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id k25sm2549498ejk.179.2022.01.10.06.41.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jan 2022 06:41: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=niEASEzg6Pyx+usIoUf1FTEHstXld9dwD71XIbZUubA=; b=NOMaxqzoLqmVGOD2v8Fenjj25dKf19CT5rKjORYLjJbxqlghF8nzkDBhx4tvoyKek1 X98HQwGGszTC95F1H/1DjrEbryXUCEK8YbWuO3QZSqiak7WIcmh+stoYQ9RsjSKY21Xr xFXRlFEyN1Iw0+wbhQsmZewjAX/z+y6TgoT+yg983ka26apiNAdXViO5FR19+mcR7+BN Tj+3EmZ1oCov5hI69jgsZrPK990/apNf+etjbankwgnVxD6z2OpOfRguIENSnfDSlnll xs83tZHGXu+jvDzUrgsbsfNvuJl4uos8vkEWe9olqwmSMkkY3J3IpstJ8ppAMyAIWSTu +QpA== 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=niEASEzg6Pyx+usIoUf1FTEHstXld9dwD71XIbZUubA=; b=cz62vVV2DFB8BQcKehoYpgueKpkyL2JXyqeVtaW4JSu+CP3vjJxSJo/ytluKsiy+CH cjaMVu6RF+OCo4j/MHPdfUknMVhq5VSVRMjo2YYV7oFaqporeIdb8UrCpoIMbeTHR/Yl gVC4+QsgPRcEUgMAIQWbXqkyvNFE6M561pTZQiHzPVdLbGR1+tW7q+uRsWxfOglgMfR2 nmFT6/Wa1udNxfrK3/2skHpsm4J46zUBTguC/YuOT1FiWAeDhrxlheXHkjrNCzzmySsQ AvG/IG3GRFLn+e3gOPONlCdIHo8uOKEyZVl5jkkZ4SvZddZB/x0z24GbJiwlsVWXFx+6 vVGA== X-Gm-Message-State: AOAM530VXfL7mJ85HaCFySvGyGhTgnWe5jrk9e9BKl2/MAl+CyAHZjxY vAOk7+w8xRuvaVVyon2C8ckrG8YePiU= X-Google-Smtp-Source: ABdhPJyXmCiJaEXK92dr7osAFo+doNhKyrsr27R2mUv+/xwkLjuTFUYgAh/lmiPQaCwuJ+Q9yrdBbg== X-Received: by 2002:aa7:d9c6:: with SMTP id v6mr9564210eds.7.1641825668229; Mon, 10 Jan 2022 06:41:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/18] meson: reenable filemonitor-inotify compilation Date: Mon, 10 Jan 2022 15:40:34 +0100 Message-Id: <20220110144034.67410-19-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220110144034.67410-1-pbonzini@redhat.com> References: <20220110144034.67410-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::529 (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::529; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x529.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.248, 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?Volker=20R=C3=BCmelin?= 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: 1641827613209100011 From: Volker R=C3=BCmelin Reenable util/filemonitor-inotify compilation. Compilation was disabled when commit a620fbe9ac ("configure: convert compiler tests to meson, part 5") moved CONFIG_INOTIFY1 from config-host.mak to config-host.h. This fixes the usb-mtp device and reenables test-util-filemonitor. Fixes: a620fbe9ac ("configure: convert compiler tests to meson, part 5") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/800 Signed-off-by: Volker R=C3=BCmelin Message-Id: <20220107133514.7785-1-vr_qemu@t-online.de> Signed-off-by: Paolo Bonzini --- tests/unit/meson.build | 2 +- util/meson.build | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/unit/meson.build b/tests/unit/meson.build index 90acf5b0da..64a5e7bfde 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -129,7 +129,7 @@ if have_system 'test-vmstate': [migration, io], 'test-yank': ['socket-helpers.c', qom, io, chardev] } - if 'CONFIG_INOTIFY1' in config_host + if config_host_data.get('CONFIG_INOTIFY1') tests +=3D {'test-util-filemonitor': []} endif =20 diff --git a/util/meson.build b/util/meson.build index e676b2f6c6..c9a9cc1cf5 100644 --- a/util/meson.build +++ b/util/meson.build @@ -84,7 +84,10 @@ if have_block util_ss.add(files('readline.c')) util_ss.add(files('throttle.c')) util_ss.add(files('timed-average.c')) - util_ss.add(when: 'CONFIG_INOTIFY1', if_true: files('filemonitor-inotify= .c'), - if_false: files('filemonitor-stub.= c')) + if config_host_data.get('CONFIG_INOTIFY1') + util_ss.add(files('filemonitor-inotify.c')) + else + util_ss.add(files('filemonitor-stub.c')) + endif util_ss.add(when: 'CONFIG_LINUX', if_true: files('vfio-helpers.c')) endif --=20 2.33.1