From nobody Tue Oct 22 22:21:19 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1727071277; cv=none; d=zohomail.com; s=zohoarc; b=iXG9zKHBmELKS76L5ZwiXsQxFOOgNglqfdGdggjpDnPt1Gc5JTLMOKP66SG7vQrIlJavpYF3taA9yDNiWDV/PJ9d+sKUgu5Nf0ek1f6wmC9oEVD9FqgJPkRvJJQLSmmniUwsPF6ImiYzRCQ4DzV3vDjlUcb3NWN48pZ9GYUe6iQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1727071277; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=gXblLKYupWhqyM5BOi2ivhHAJ3SEUqdFVB7cIyAHMqw=; b=cDyOIecDNY692LQb6vmNL51ZNrrjO7alVHypLWtQh+AIlmba1+QOjLiqWpBZHi/1FX1OYxhUL2Qd5IJybMrn4+wH4Lz7aM18PMAddEnASqUDLWSm/4Z58Vo6FcqMnvSTyzxdBNe/qOHDPkqF8zf7W/m6E6/PSTFEclHvCQdrXRk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1727071277442569.5510012043836; Sun, 22 Sep 2024 23:01:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ssc7q-0003gk-E1; Mon, 23 Sep 2024 02:00:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ssc7p-0003fc-0w for qemu-devel@nongnu.org; Mon, 23 Sep 2024 02:00:45 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ssc7m-0003zb-LW for qemu-devel@nongnu.org; Mon, 23 Sep 2024 02:00:44 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-374c1120a32so2482884f8f.1 for ; Sun, 22 Sep 2024 23:00:41 -0700 (PDT) Received: from [127.0.1.1] (adsl-13.37.6.161.tellas.gr. [37.6.161.13]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42e754c5627sm117257725e9.40.2024.09.22.23.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 23:00:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727071240; x=1727676040; darn=nongnu.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=gXblLKYupWhqyM5BOi2ivhHAJ3SEUqdFVB7cIyAHMqw=; b=T0oyVqq6rc1BWlrQlAwR3Kf2rTE8UcYhXg5sAg7gMS48LaFj4uD8cMGcaqRcAMEtW3 HKCZ8BXpA7qmAFIUL/k8n8XBiDcn4biMHBGGpt6aMkaWe9tpLXngPjVQ7IISRgzCZw+n wu23/+4EIIdbJLNVTgWPssPNJeiarIOdRMl1JkBNH0wAFtQr4QEMkxbbSXVHu2qYgAZA 92pcR6RQeSlPovt0ruAVM0cACl7G9InEQxdc22eX3x3jclt0tE2qn1LjG2WHh1hcHvfO R7XtEQMnD2p/tFDtUkSYVCv8dBN3yvmNpI2fvDMm6+po1W2/qVnIugqotU5UUGlKIa/H tYOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727071240; x=1727676040; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gXblLKYupWhqyM5BOi2ivhHAJ3SEUqdFVB7cIyAHMqw=; b=pwrzvA32i17zD7NXmYsEVdru0RDkcx7yJoApFUobqdTOG5LirGpGCdqlw0ss3/5ErG roEslCcm3rbCjlZ+pGiRK+gxYIUAt4X3pqgOim07aqq0cC6kJESlMLrmWFvnUnAsUMUv a3g2fNixkm7dJOJKyF/zDvE4gIzDkf9g7ijUOOfNPqp82nj9rzIlTKP9rB6cojcct6HN 9ycMhDUXr7Y8Wvx6vanBBmCQ9LmFKrhD0EO3e+EafHTihJaivZwaTgq2oKXaS8PGXvaY B+9PO+qqVvcCud1/7R/UCPht4fxe08sja0Meg+59TgBebh6tYUg6N+i5RvaVyrQhBYol kycw== X-Gm-Message-State: AOJu0YxEZ5Yc29fHunaF4cQGxX9K3a2RdzpxvzTzu9T6pr4nHilpXi1C hOjuXTMw/HKfwnb9p9rYRhYFcCOfwd1Q8RY1cnYb3IqlaHHcPc4hgweIW/BTAYE= X-Google-Smtp-Source: AGHT+IHLALtlbx8aAXR61q6eNHQUTKcCBeTy2DLyF1/tWkYjmoJFh4rHBgYKaKC6IYGlO0v9xrvWfQ== X-Received: by 2002:adf:e810:0:b0:37a:26f4:18a2 with SMTP id ffacd0b85a97d-37a42252b8dmr5448188f8f.4.1727071238699; Sun, 22 Sep 2024 23:00:38 -0700 (PDT) From: Manos Pitsidianakis Date: Mon, 23 Sep 2024 09:00:03 +0300 Subject: [PATCH] Add -build-info and -build-info-json CLI arguments MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20240923-feature-build-info-cli-v1-1-e8c42d845390@linaro.org> X-B4-Tracking: v=1; b=H4sIAOID8WYC/x3MQQ5AMBBG4avIrE1S1QWuIhZaf5lESlpEIu6us fwW7z2UEAWJuuKhiEuSbCGjKgtyyxhmsEzZpJU2qtWaPcbjjGB7yjqxBL+xW4VdC9WgNq42lnK 8R3i5/3E/vO8HdZKojGgAAAA= To: qemu-devel@nongnu.org Cc: Cleber Rosa , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , John Snow , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Gustavo Romero , Peter Maydell , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Richard Henderson , Manos Pitsidianakis X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=13688; i=manos.pitsidianakis@linaro.org; h=from:subject:message-id; bh=hVmfkLPg5hxNk2AqV81ijNzvPtOZctLfTlE7WtE6sC8=; b=LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tCgpvd0VCYlFLUy9aQU5Bd0FLQVhjcHgzQi9mZ 25RQWNzbVlnQm04UVFFa0RKWlhUWE1vM2g3Rytob3g2Z1BOWjlJCllSOTdhQ01OaDdyZGNsR3pp Q1NKQWpNRUFBRUtBQjBXSVFUTVhCdE9SS0JXODRkd0hSQjNLY2R3ZjM0SjBBVUMKWnZFRUJBQUt DUkIzS2Nkd2YzNEowQ3VURUFDZWlaa0JDbERvNXNtQlNhTVRhTlgxRVl6S216aEZ3YVEybWVQVg pVZFIrbXJjY0IxSmtyYllaY0xVc3ViTUxPSkNCcVNYR1h4MklqSU9iYnZTZU9ELzlkRS9tM0FhN DZqNEdyaXFyCkFvMmNHTTNVT0ZpSHlNSWc3Q3RhSVFmSUdiSEJReTB1K04rSzlJV29YSkd0TXU2 M0Q2dEIxUllyMFJRcWluM1kKS29IRThEK09KVldoeGVqMkR5eHJTOEsxK1M0NmpqdElVbW1YVy9 mU0FDZlJlZVVjTlZIQi9wQ2F4M2RzQ0ErQgpwbEZ0Z0szL3pHaHVTUCtrQVVjOWlDT1U2VjJYSk 55cG5SK29hdXlMR1k4cHhienBhSGJWc1Z1elhzZ0hnemtnCmlNUEQ2Y3JEc1B1aDF4K3hpQk1jK 2xidllIRjRzSmhsL1lYL1RHbTkyM3BGUUJlWHlDaHNUQWc3ZzhObVJRRkIKR25udEhXcXRLWGpS eVRlUGsrRkZRN242cGNuMHJLRW94blNpTVN2Q1U2RjZ0VHdyTSs4Ym5mNytMbzFLZHltUgp0dUx BbDUrTGtnYmJ3MW05aVgxcnp4VGtCTysvZ2txd3RnaFBvTDRsNEFFelJrRW12MmE5Ynl0a2p0dn JVcTIrCjZVNi9vMjBhTEU0OTBYdTJyd0g5L2JGVmJkcTlRcWdIUzQvc25XQStCdlFSOCt4WVRjY k16eC9ZWUZlYXBRZEIKQjAzMmk3eERXTEk4eUsxem1wb2JhaUh6QTV1WlM0ZHlpMDJVaWJ5YlRU K1NNbjkxbTZhZTNHcW15UEEydXZhZAo1SEJPR0M3NERhNWxPRXBIVmo2enhjVDZxQ0M5ZGlnVlF NaEJpVDZIdjZUN0lpUWNGcEwzMDBwM2RpSXJtcm1QCjB1cmlXdz09Cj02MzFICi0tLS0tRU5EIF BHUCBNRVNTQUdFLS0tLS0K X-Developer-Key: i=manos.pitsidianakis@linaro.org; a=openpgp; fpr=7C721DF9DB3CC7182311C0BF68BC211D47B421E1 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::42c; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wr1-x42c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1727071279904116600 Add -build-info and -build-info-json CLI arguments for human and machine readable output of build/compile-time configuration data. The source for this data is the meson generated config-host.h. This information is mainly of interest to developers and other folk who deal with many different builds of QEMU and need a way to properly differentiate them. Because there's always the chance someone will want to consume an interface programmatically, also add a -json option that does the same but outputs a machine-readable JSON object. Signed-off-by: Manos Pitsidianakis --- Notes: Sample output: $ ./qemu-system-aarch64 -build-info ./qemu-system-aarch64 version 9.1.50 (v9.0.0-3444-g8d988656d8) build inform= ation configuration key key value ----------------- --------- accept4 =20 af_vsock =20 asan_iface_fiber =20 atomic64 =20 attr =20 audio_alsa =20 audio_drivers pa,sndio,oss audio_oss =20 audio_pa =20 audio_pipewire =20 audio_sdl =20 audio_sndio =20 avx2_opt =20 avx512bw_opt =20 bdrv_ro_whitelist =20 bdrv_rw_whitelist =20 bindir /usr/local/bin blkzoned =20 brlapi =20 capstone =20 clock_adjtime =20 close_range =20 coroutine_pool =20 cpuid_h =20 curl =20 curses =20 dbus_display =20 debug_graph_lock =20 debug_mutex =20 debug_tcg =20 dup3 =20 ebpf =20 epoll =20 epoll_create1 =20 eventfd =20 fallocate =20 fallocate_punch_hole =20 fallocate_zero_range =20 fdatasync =20 fdt =20 fiemap =20 fsfreeze =20 fstrim =20 fuse =20 fuse_lseek =20 gbm =20 getauxval =20 getcpu =20 getrandom =20 gettid =20 gio =20 gnutls =20 gnutls_crypto =20 gtk =20 hexagon_idef_parser =20 host_dsosuf .so iasl /bin/iasl inotify =20 inotify1 =20 int128 =20 int128_type =20 iovec =20 keyutils =20 kvm_targets i386-softmmu,x86_64-softmmu l2tpv3 =20 libdw =20 libudev =20 linux =20 linux_io_uring =20 linux_magic_h =20 madvise =20 malloc_trim =20 memalign =20 memfd =20 opengl =20 open_by_handle =20 pixman =20 plugin =20 png =20 posix =20 posix_fallocate =20 posix_madvise =20 posix_memalign =20 ppoll =20 prctl_pr_set_timerslack =20 preadv =20 prefix /usr/local pthread_affinity_np =20 pthread_setname_np_w_tid =20 qemu_confdir /usr/local/etc/qemu qemu_datadir /usr/local/share/qemu qemu_desktopdir /usr/local/share/applications qemu_firmwarepath /usr/local/share/qemu-firmware qemu_helperdir /usr/local/libexec qemu_icondir /usr/local/share/icons qemu_localedir /usr/local/share/locale qemu_localstatedir /var/local qemu_moddir /usr/local/lib/x86_64-linux-gnu/qemu qom_cast_debug =20 relocatable =20 replication =20 rtnetlink =20 sdl =20 seccomp =20 seccomp_sysrawrc =20 secret_keyring =20 selinux =20 sendfile =20 setns =20 signalfd =20 slirp =20 smbd_command /usr/sbin/smbd splice =20 statx =20 statx_mnt_id =20 syncfs =20 sync_file_range =20 sysconfdir /usr/local/etc sysmacros =20 tasn1 =20 tcg 1 timerfd =20 tls_priority NORMAL tpm =20 trace_file trace trace_log =20 usbfs =20 usb_libusb =20 valgrind_h =20 valloc =20 vduse_blk_export =20 vhost =20 vhost_crypto =20 vhost_kernel =20 vhost_net =20 vhost_net_user =20 vhost_net_vdpa =20 vhost_user =20 vhost_user_blk_server =20 vhost_vdpa =20 virtfs =20 vnc =20 vnc_jpeg =20 vte =20 x11 =20 xen_backend =20 xen_ctrl_interface_version 41700 xkbcommon =20 zstd =20 blk_zone_rep_capacity =20 btrfs_h =20 copy_file_range =20 drm_h =20 fsxattr =20 getifaddrs =20 host_block_device =20 ipproto_mptcp =20 mlockall =20 openpty =20 pty_h =20 strchrnul =20 struct_stat_st_atim =20 system_function =20 utmpx =20 virgl_d3d_info_ext =20 host_x86_64 1 qemu_version 9.1.50 qemu_version_major 9 qemu_version_micro 50 qemu_version_minor 1 --- meson.build | 15 +++++++- qemu-options.hx | 14 ++++++++ scripts/build_info_gen.py | 91 +++++++++++++++++++++++++++++++++++++++++++= ++++ system/vl.c | 41 +++++++++++++++++++++ 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 10464466ff..eff2ee323a 100644 --- a/meson.build +++ b/meson.build @@ -3292,7 +3292,20 @@ endif # Generated sources # ##################### =20 -genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) +config_host_h =3D configure_file(output: 'config-host.h', configuration: c= onfig_host_data) +genh +=3D config_host_h + +build_info_h =3D custom_target('build-info.h', + output: 'build-info.h', + command: [ + find_program('scripts/build_info_gen.py'), + '--config-headers', + config_host_h + ], + capture: true, + build_by_default: true, + build_always_stale: true) +genh +=3D build_info_h =20 hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.py') diff --git a/qemu-options.hx b/qemu-options.hx index d94e2cbbae..3f17b7371b 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -24,6 +24,20 @@ SRST Display version information and exit ERST =20 +DEF("build-info", 0, QEMU_OPTION_build_info, + "-build-info display build information of executable and exit\n= ", QEMU_ARCH_ALL) +SRST +``-build-info`` + Display build information of executable and exit +ERST + +DEF("build-info-json", 0, QEMU_OPTION_build_info_json, + "-build-info-json dump build information of executable in JSON = format and exit\n", QEMU_ARCH_ALL) +SRST +``-build-info-json`` + Dump build information of executable in JSON format and exit +ERST + DEF("machine", HAS_ARG, QEMU_OPTION_machine, \ "-machine [type=3D]name[,prop[=3Dvalue][,...]]\n" " selects emulated machine ('-machine help' for list)\n" diff --git a/scripts/build_info_gen.py b/scripts/build_info_gen.py new file mode 100755 index 0000000000..37a9421651 --- /dev/null +++ b/scripts/build_info_gen.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python3 + +""" +Generate build information header, build-info.h, +for output of -build-info* command line arguments. + +SPDX-FileContributor: Manos Pitsidianakis +SPDX-FileCopyrightText: 2024 Linaro Ltd. +SPDX-License-Identifier: GPL-2.0-or-later +""" + +# Formatted with black --line-length 80 scripts/build-info-gen.py + +import argparse +import logging + + +def generate_key_val(header: str) -> str: + # pylint: disable=3Dmissing-function-docstring + + with open(header, encoding=3D"utf-8") as cfg: + config =3D [l.split()[1:] for l in cfg if l.startswith("#define")] + + for cfg in config: + if cfg[0].startswith("HAVE_"): + yield (cfg[0].removeprefix("HAVE_").lower(), None) + continue + yield ( + cfg[0].removeprefix("CONFIG_").lower(), + ( + cfg[1] + if len(cfg) =3D=3D 2 + else "".join(cfg[1:]).replace('"', "") if len(cfg) > 2 els= e None + ), + ) + + +def main() -> None: + # pylint: disable=3Dmissing-function-docstring + parser =3D argparse.ArgumentParser() + parser.add_argument("-v", "--verbose", action=3D"store_true") + parser.add_argument( + "--config-headers", + metavar=3D"CONFIG_HEADER", + action=3D"append", + dest=3D"config_headers", + help=3D"paths to configuration host C headers (*.h files)", + required=3DFalse, + default=3D[], + ) + args =3D parser.parse_args() + if args.verbose: + logging.basicConfig(level=3Dlogging.ERROR) + logging.debug("args: %s", args) + print( + """// @generated by scripts/build-info-gen.py + +#include """ + ) + print( + """static struct build_info_t { + const char *key; + const char *value; +} BUILD_INFO[] =3D {""" + ) + total =3D 0 + header_width =3D 0 + for header in args.config_headers: + for key, val in generate_key_val(header): + total +=3D 1 + header_width =3D max(header_width, len(key)) + print( + '{"', + key, + '", "', + val.strip('"').strip(",").strip('"') if val else "", + '"},', + sep=3D"", + ) + print("};") + print("\nstatic size_t BUILD_INFO_SIZE =3D ", total, ";", sep=3D"") + print( + "static unsigned int BUILD_INFO_HEADER_WIDTH =3D ", + header_width, + ";", + sep=3D"", + ) + + +if __name__ =3D=3D "__main__": + main() diff --git a/system/vl.c b/system/vl.c index fe547ca47c..5266b85d22 100644 --- a/system/vl.c +++ b/system/vl.c @@ -908,6 +908,41 @@ static void help(int exitcode) exit(exitcode); } =20 +static void build_info(const char *execname, bool as_json) +{ +#include "build-info.h" + if (as_json) { + printf("{\n"); + for (size_t i =3D 0; i + 1 < BUILD_INFO_SIZE ; i++) { + printf("\"%s\":\"%s\",\n", + BUILD_INFO[i].key, + BUILD_INFO[i].value); + } + if (BUILD_INFO_SIZE > 0) { + printf("\"%s\":\"%s\"\n", + BUILD_INFO[BUILD_INFO_SIZE - 1].key, + BUILD_INFO[BUILD_INFO_SIZE - 1].value); + } + printf("}\n"); + } else { + printf("%s version " + QEMU_FULL_VERSION + " build information\n\n", execname ?:"QEMU"); + printf(" %-*s key value\n", + BUILD_INFO_HEADER_WIDTH, + "configuration key"); + printf(" %-*s ---------\n", + BUILD_INFO_HEADER_WIDTH, + "-----------------"); + for (size_t i =3D 0; i < BUILD_INFO_SIZE ; i++) { + printf(" %-*s %s\n", + BUILD_INFO_HEADER_WIDTH, + BUILD_INFO[i].key, + BUILD_INFO[i].value); + } + } +} + enum { =20 #define DEF(option, opt_arg, opt_enum, opt_help, arch_mask) \ @@ -3019,6 +3054,12 @@ void qemu_init(int argc, char **argv) version(); exit(0); break; + case QEMU_OPTION_build_info: + /* fallthrough */ + case QEMU_OPTION_build_info_json: + build_info(argv[0], popt->index !=3D QEMU_OPTION_build_inf= o); + exit(0); + break; case QEMU_OPTION_m: opts =3D qemu_opts_parse_noisily(qemu_find_opts("memory"),= optarg, true); if (opts =3D=3D NULL) { --- base-commit: 01dc65a3bc262ab1bec8fe89775e9bbfa627becb change-id: 20240922-feature-build-info-cli-c9e08e34c34b -- =CE=B3=CE=B1=E1=BF=96=CE=B1 =CF=80=CF=85=CF=81=CE=AF =CE=BC=CE=B9=CF=87=CE= =B8=CE=AE=CF=84=CF=89