From patchwork Mon Sep 23 06:05:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Manos Pitsidianakis X-Patchwork-Id: 13809297 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 69B73CF9C6F for ; Mon, 23 Sep 2024 06:06:18 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sscCV-00085D-NF; Mon, 23 Sep 2024 02:05:35 -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 1sscCS-00083g-US for qemu-devel@nongnu.org; Mon, 23 Sep 2024 02:05:34 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sscCQ-0004N7-Hz for qemu-devel@nongnu.org; Mon, 23 Sep 2024 02:05:32 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-42cb806623eso32219455e9.2 for ; Sun, 22 Sep 2024 23:05:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1727071529; x=1727676329; 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=AK60c3rGPv0Vxm966ds2VwWlnvpAQkcKWEabfhnA/V4=; b=ojAYDHRsOs2rzoOuKXnffg9fzptibIgo9Pzjrb96IGkf+N1KDz7lXW48UR75TfPL8g XoEC6ykyKnqtlFqYDjHYf4wLZ+W4520j9cCRSYGfh9ZjRdojVLiy9HL+yjUllyn7cI+N cNj1hMlFvKZQtVR0xGjBB5fip+UITMQgcKWd1iCLRqWOrbmWosQY5Gr+gS2yvscQRbAt CXIwlj3eJPwMP0x622Sx8VrJioqczwLZLKcQug0tsKO5Tknp/TEWX97YfpnBcb8vJApY TaAp71wSTpusVTBpNVv3QWtlFaBzZ3+Z6mPdT8jBj9YBInzAvPcrB13bnDPHxvxcwiw5 yTmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1727071529; x=1727676329; 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=AK60c3rGPv0Vxm966ds2VwWlnvpAQkcKWEabfhnA/V4=; b=N4QlcVUiLXqbdZ+T+Jifqxf18/jTD91zr1+K51pVa0FhxapaWJGxhfIuJFn1BJnXyq 07rV6tkIG53G2pLWbmLanAKHzmXXAuFyd+RBeuAXGF1txP8eZCuqFMObLw0xXlUVolGz Z5Nn0eEKBB6Ke+Wzq3OCAbSxzSzN4K4mlYwy0d/A5wRdF2nvlt/sNacWEkBhGH2GqZjS uBKnfsM2jsY+dzpGnBs90fKwbl7SQ4v65MCTsV9NeUkxGs1GOIz0JJ6tKgNrYpsyYR8h hsEkHdF/vrquVQAxRsHALApBr4t+HtBDePC2JUcjMVClXKh/2SW1niDKu2MbpNyzwu2A XQJQ== X-Gm-Message-State: AOJu0YzPCp5NHzBXadi5QiRW/HSZb5qbfMkv+nU63XSPZs4x1lZoHOqW xAqKJH2bf3lNfjFPMyQNXIVKHM/LF3Ck5GhyFB95/eOXSUSM2p6IDsDCzPhD+R4= X-Google-Smtp-Source: AGHT+IEyS8NRtgxRsAWZzsIFkKgJeP5b2qPerbNSnY2bDGlaZuenDzINxafwKK0N1zMhjEZY11niOw== X-Received: by 2002:a05:600c:3b17:b0:42c:bd4d:e8ba with SMTP id 5b1f17b1804b1-42e7abe7af6mr76310415e9.8.1727071528684; Sun, 22 Sep 2024 23:05:28 -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-42e75450aa0sm116102185e9.22.2024.09.22.23.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Sep 2024 23:05:28 -0700 (PDT) From: Manos Pitsidianakis Date: Mon, 23 Sep 2024 09:05:24 +0300 Subject: [PATCH v2] Add -build-info and -build-info-json CLI arguments MIME-Version: 1.0 Message-Id: <20240923-feature-build-info-cli-v2-1-66b3462f16a1@linaro.org> X-B4-Tracking: v=1; b=H4sIACMF8WYC/3WNQQqDMBBFryKz7pSYpKBd9R7iQuOoA5KUiYYW8 e5NhS67fA/++ztEEqYI92IHocSRg8+gLwW4ufMTIQ+ZQSttVa01jtStmxD2Gy8Dsh8DuoXR1aQ qMtYZ20MeP4VGfp3hps08c1yDvM+fVH7tL2n+JVOJJVLlrB4qezO1eizsOwnXIBO0x3F8AFiFD Bi9AAAA To: qemu-devel@nongnu.org Cc: Manos Pitsidianakis , 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?= =?utf-8?q?=C3=A9?= , Pierrick Bouvier , Richard Henderson X-Mailer: b4 0.14.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=14513; i=manos.pitsidianakis@linaro.org; h=from:subject:message-id; bh=N3cSLs2qzFLZte8H6uk/j+EcwzX5RHqZWC6V4/QKdrg=; b=LS0tLS1CRUdJTiBQR1AgTUVTU0FHRS0tLS0tCgpvd0VCYlFLUy9aQU5Bd0FLQVhjcHgzQi9mZ 25RQWNzbVlnQm04UVVtU2pSZmVOOTkvZlI4UE5TYnlwdFBYUFoyCjJVaU1WeWJGWG96RUZxck1x VXVKQWpNRUFBRUtBQjBXSVFUTVhCdE9SS0JXODRkd0hSQjNLY2R3ZjM0SjBBVUMKWnZFRkpnQUt DUkIzS2Nkd2YzNEowRWhVRC80cS9jWGNJTEpBenQ5UVQ2bXJOUk1kUTlDYTNQalFuZDRIakd1Tw pjUjIvRGlpR3Z0KzBXUGVIb2U2dkwycU1kN2pJYnB0RzJFOFhrcVpFam93VHhvYmc4ZVlmclQ2N mdHc1o1U1hmCnZWOXpIbnlrcXhqRituRWhRV3d5bExBY0tjSWVidUVGQ3h0MkZOOVE1WWp5VWU5 TWtmVkRQYzJNdWM2MFpoMHMKTmVxVkptWmxCeDVHYjFqcHpPeUlzbjdhL0tETmZmUUZvNkxhcTB hd3Bwa0hXYUNQQWVMZWNudXJhcERYQUNBVgp4bWs3STZIMU9VaUkrMm1oZnJlTFVVUlVOYkVCYV d2Zno1OWo1V0Y1MCtBajU0ckIvQlZjejdDU3BkUTV3MXdECkR4WmtUcmhrSktZK1huZUJMVWg2S TB5OUJVQkVyT202QlZ5L24vbHA2eE4wTk1uZEFzQisxZnMrRVlxN2tKYy8KMldjNUdaY3dXY01Y YzZwWkpJa0F3YXRHR1p6dnJ1RjdBRXZIY0FOQ284bHpDejFCdHViSkZwUWdYOWpON1luRQpKVzN raWNoYmVCTkVsZE9JZ0pGSTA1c1FqeGxhMzU3WTB6YjMxT0xJZHBXSDIvcVNMQVlub2pNdXZWRW hYSWNtCkZ3Mm94dG85WXRkWHBLVGsxR2c1R0x6ME5XRkdBYVUzT3pkU1pRdjc0SzlIOXJOUW1ZV 09mTmdRaGNKbVp4TWkKTkI0ZXJOa3lSdTZoMWpxUXUwYm9BaEFveGxqcy9yVlBDZUR1dFE3ais1 ZkRXS2ZyNEkrazVHQlRlTlZJcjhJbgpFdDFkVndleUkwbmVYdzNRam5FK3QzZjFJZWJPa2U0dll IY2NEczM5OGJNOTc1dVd3aHkvUmUwWWpiSm5MdWxNCmlkMFBsdz09Cj1nNVJqCi0tLS0tRU5EIF BHUCBNRVNTQUdFLS0tLS0K X-Developer-Key: i=manos.pitsidianakis@linaro.org; a=openpgp; fpr=7C721DF9DB3CC7182311C0BF68BC211D47B421E1 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=manos.pitsidianakis@linaro.org; helo=mail-wm1-x331.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org 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 --- Changes in v2: - Fixed alignment of command and documentation in -h output. - Link to v1: https://lore.kernel.org/r/20240923-feature-build-info-cli-v1-1-e8c42d845390@linaro.org --- Notes: Sample output: $ ./qemu-system-aarch64 -build-info ./qemu-system-aarch64 version 9.1.50 (v9.0.0-3444-g8d988656d8) build information configuration key key value ----------------- --------- accept4 af_vsock asan_iface_fiber atomic64 attr audio_alsa audio_drivers pa,sndio,oss audio_oss audio_pa audio_pipewire audio_sdl audio_sndio avx2_opt avx512bw_opt bdrv_ro_whitelist bdrv_rw_whitelist bindir /usr/local/bin blkzoned brlapi capstone clock_adjtime close_range coroutine_pool cpuid_h curl curses dbus_display debug_graph_lock debug_mutex debug_tcg dup3 ebpf epoll epoll_create1 eventfd fallocate fallocate_punch_hole fallocate_zero_range fdatasync fdt fiemap fsfreeze fstrim fuse fuse_lseek gbm getauxval getcpu getrandom gettid gio gnutls gnutls_crypto gtk hexagon_idef_parser host_dsosuf .so iasl /bin/iasl inotify inotify1 int128 int128_type iovec keyutils kvm_targets i386-softmmu,x86_64-softmmu l2tpv3 libdw libudev linux linux_io_uring linux_magic_h madvise malloc_trim memalign memfd opengl open_by_handle pixman plugin png posix posix_fallocate posix_madvise posix_memalign ppoll prctl_pr_set_timerslack preadv prefix /usr/local pthread_affinity_np pthread_setname_np_w_tid 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 relocatable replication rtnetlink sdl seccomp seccomp_sysrawrc secret_keyring selinux sendfile setns signalfd slirp smbd_command /usr/sbin/smbd splice statx statx_mnt_id syncfs sync_file_range sysconfdir /usr/local/etc sysmacros tasn1 tcg 1 timerfd tls_priority NORMAL tpm trace_file trace trace_log usbfs usb_libusb valgrind_h valloc vduse_blk_export vhost vhost_crypto vhost_kernel vhost_net vhost_net_user vhost_net_vdpa vhost_user vhost_user_blk_server vhost_vdpa virtfs vnc vnc_jpeg vte x11 xen_backend xen_ctrl_interface_version 41700 xkbcommon zstd blk_zone_rep_capacity btrfs_h copy_file_range drm_h fsxattr getifaddrs host_block_device ipproto_mptcp mlockall openpty pty_h strchrnul struct_stat_st_atim system_function utmpx virgl_d3d_info_ext host_x86_64 1 qemu_version 9.1.50 qemu_version_major 9 qemu_version_micro 50 qemu_version_minor 1 To: qemu-devel@nongnu.org Cc: "Cleber Rosa" Cc: "Daniel P. Berrangé" Cc: "John Snow" Cc: "Marc-André Lureau" Cc: "Paolo Bonzini" Cc: "Alex Bennée" Cc: "Gustavo Romero" Cc: "Peter Maydell" Cc: "Philippe Mathieu-Daudé" Cc: "Pierrick Bouvier" Cc: "Richard Henderson" Signed-off-by: Manos Pitsidianakis --- meson.build | 15 +++++++- qemu-options.hx | 15 ++++++++ scripts/build_info_gen.py | 91 +++++++++++++++++++++++++++++++++++++++++++++++ system/vl.c | 41 +++++++++++++++++++++ 4 files changed, 161 insertions(+), 1 deletion(-) --- base-commit: 01dc65a3bc262ab1bec8fe89775e9bbfa627becb change-id: 20240922-feature-build-info-cli-c9e08e34c34b -- γαῖα πυρί μιχθήτω 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 # ##################### -genh += configure_file(output: 'config-host.h', configuration: config_host_data) +config_host_h = configure_file(output: 'config-host.h', configuration: config_host_data) +genh += config_host_h + +build_info_h = 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 += build_info_h hxtool = find_program('scripts/hxtool') shaderinclude = find_program('scripts/shaderinclude.py') diff --git a/qemu-options.hx b/qemu-options.hx index d94e2cbbae..6a32e0624f 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -24,6 +24,21 @@ SRST Display version information and exit ERST +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\n" + " 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=]name[,prop[=value][,...]]\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=missing-function-docstring + + with open(header, encoding="utf-8") as cfg: + config = [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) == 2 + else "".join(cfg[1:]).replace('"', "") if len(cfg) > 2 else None + ), + ) + + +def main() -> None: + # pylint: disable=missing-function-docstring + parser = argparse.ArgumentParser() + parser.add_argument("-v", "--verbose", action="store_true") + parser.add_argument( + "--config-headers", + metavar="CONFIG_HEADER", + action="append", + dest="config_headers", + help="paths to configuration host C headers (*.h files)", + required=False, + default=[], + ) + args = parser.parse_args() + if args.verbose: + logging.basicConfig(level=logging.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[] = {""" + ) + total = 0 + header_width = 0 + for header in args.config_headers: + for key, val in generate_key_val(header): + total += 1 + header_width = max(header_width, len(key)) + print( + '{"', + key, + '", "', + val.strip('"').strip(",").strip('"') if val else "", + '"},', + sep="", + ) + print("};") + print("\nstatic size_t BUILD_INFO_SIZE = ", total, ";", sep="") + print( + "static unsigned int BUILD_INFO_HEADER_WIDTH = ", + header_width, + ";", + sep="", + ) + + +if __name__ == "__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); } +static void build_info(const char *execname, bool as_json) +{ +#include "build-info.h" + if (as_json) { + printf("{\n"); + for (size_t i = 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 = 0; i < BUILD_INFO_SIZE ; i++) { + printf(" %-*s %s\n", + BUILD_INFO_HEADER_WIDTH, + BUILD_INFO[i].key, + BUILD_INFO[i].value); + } + } +} + enum { #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 != QEMU_OPTION_build_info); + exit(0); + break; case QEMU_OPTION_m: opts = qemu_opts_parse_noisily(qemu_find_opts("memory"), optarg, true); if (opts == NULL) {