Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195645/?format=api
{ "id": 2195645, "url": "http://patchwork.ozlabs.org/api/patches/2195645/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260211152508.732487-26-berrange@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20260211152508.732487-26-berrange@redhat.com>", "list_archive_url": null, "date": "2026-02-11T15:25:06", "name": "[v6,25/27] util: add support for formatting a program name in messages", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "611050b98026a7a65ba458643ba35752afb66fa9", "submitter": { "id": 2694, "url": "http://patchwork.ozlabs.org/api/people/2694/?format=api", "name": "Daniel P. Berrangé", "email": "berrange@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260211152508.732487-26-berrange@redhat.com/mbox/", "series": [ { "id": 491862, "url": "http://patchwork.ozlabs.org/api/series/491862/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=491862", "date": "2026-02-11T15:24:41", "name": "util: sync error_report & qemu_log output more closely", "version": 6, "mbox": "http://patchwork.ozlabs.org/series/491862/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2195645/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195645/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=SXom4Kvk;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fB2R62r8cz1xtr\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Feb 2026 02:29:22 +1100 (AEDT)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1vqC83-0001iH-Oi; Wed, 11 Feb 2026 10:27:47 -0500", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <berrange@redhat.com>)\n id 1vqC80-0001NZ-Ut\n for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:27:44 -0500", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <berrange@redhat.com>)\n id 1vqC7y-0006CC-TI\n for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:27:44 -0500", "from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by\n relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n cipher=TLS_AES_256_GCM_SHA384) id us-mta-653-Jhah7hOSPkajzZak78C0cA-1; Wed,\n 11 Feb 2026 10:27:40 -0500", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n (No client certificate requested)\n by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id DDB9019560B7; Wed, 11 Feb 2026 15:27:37 +0000 (UTC)", "from toolbx.redhat.com (unknown [10.45.227.9])\n by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP\n id DEC8230001A8; Wed, 11 Feb 2026 15:27:32 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1770823662;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=YwhZVny6ANCAea7yxq04kQyFzA8sSOUNU+TBc2DZGz8=;\n b=SXom4KvkE1fH+GvUMGJ5XvMktLHZiCUmKMDzMLJ/BMO3TE5pyle1GHmolU9A37QkRCv1/V\n NR0tFWRJo8kDCax1LGnAU9yuGTK25n8GGT4f77ZKAMFy3jF7sttbU/1Lij6+z0gYrfh0DY\n tSRGDurr++6oN1QhJEfCQlH7gEFNfk4=", "X-MC-Unique": "Jhah7hOSPkajzZak78C0cA-1", "X-Mimecast-MFC-AGG-ID": "Jhah7hOSPkajzZak78C0cA_1770823658", "From": "=?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "Manos Pitsidianakis <manos.pitsidianakis@linaro.org>,\n Stefan Weil <sw@weilnetz.de>, \"Dr. David Alan Gilbert\" <dave@treblig.org>,\n Pierrick Bouvier <pierrick.bouvier@linaro.org>, devel@lists.libvirt.org,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>, =?utf-8?q?Marc?=\n\t=?utf-8?q?-Andr=C3=A9_Lureau?= <marcandre.lureau@redhat.com>,\n Hanna Reitz <hreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>,\n qemu-block@nongnu.org, qemu-rust@nongnu.org,\n Paolo Bonzini <pbonzini@redhat.com>, Markus Armbruster <armbru@redhat.com>,\n Gerd Hoffmann <kraxel@redhat.com>,\n =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= <berrange@redhat.com>,\n Christian Schoenebeck <qemu_oss@crudebyte.com>,\n Richard Henderson <richard.henderson@linaro.org>", "Subject": "[PATCH v6 25/27] util: add support for formatting a program name in\n messages", "Date": "Wed, 11 Feb 2026 15:25:06 +0000", "Message-ID": "<20260211152508.732487-26-berrange@redhat.com>", "In-Reply-To": "<20260211152508.732487-1-berrange@redhat.com>", "References": "<20260211152508.732487-1-berrange@redhat.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "Received-SPF": "pass client-ip=170.10.129.124;\n envelope-from=berrange@redhat.com;\n helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-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": "qemu development <qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "The error_report function can include the program name in any\nmessages it prints. The qemu_log function has no equivalent\nbehaviour.\n\nThis introduces support for a \"program name\" in the new\nmessages API, which will be included by default for all\nbinaries.\n\nThis change tweaks the output of the error_report function,\nadding a space between the program name and the location\ninfo. The qemu_log function will gain the program name. This\ncan be easily seen with the 'log' trace backend, and how it\nis now more closely matching error_report output.\n\nBefore:\n\n # qemu-system-x86_64 -object tls-creds-x509,id=t0,dir=fish -d 'trace:qcrypto*'\n qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x5584e13937f0 dir=fish\n qcrypto_tls_creds_get_path TLS creds path creds=0x5584e13937f0 filename=ca-cert.pem path=<none>\n qemu-system-x86_64: Unable to access credentials fish/ca-cert.pem: No such file or directory\n\nAfter:\n\n # qemu-system-x86_64 -object tls-creds-x509,id=t0,dir=fish -d 'trace:qcrypto*'\n qemu-system-x86_64: qcrypto_tls_creds_x509_load TLS creds x509 load creds=0x5584e13937f0 dir=fish\n qemu-system-x86_64: qcrypto_tls_creds_get_path TLS creds path creds=0x5584e13937f0 filename=ca-cert.pem path=<none>\n qemu-system-x86_64: Unable to access credentials fish/ca-cert.pem: No such file or directory\n\nWhen adding this the '-msg program-name=on|off' option is\nintroduced, so that the program name (which is enabled by\ndefault) can be supressed if desired. This could be useful\nif '-msg guest-name=on' is being used as a more informative\nidentifier.\n\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: Daniel P. Berrangé <berrange@redhat.com>\n---\n include/qemu/message.h | 1 +\n qemu-options.hx | 9 +++++++--\n system/vl.c | 11 ++++++++++-\n tests/unit/test-error-report.c | 5 +++--\n util/error-report.c | 4 ----\n util/message.c | 10 +++++++++-\n 6 files changed, 30 insertions(+), 10 deletions(-)", "diff": "diff --git a/include/qemu/message.h b/include/qemu/message.h\nindex cfc3c92648..b8518d06be 100644\n--- a/include/qemu/message.h\n+++ b/include/qemu/message.h\n@@ -6,6 +6,7 @@\n enum QMessageFormatFlags {\n QMESSAGE_FORMAT_TIMESTAMP = (1 << 0),\n QMESSAGE_FORMAT_WORKLOAD_NAME = (1 << 1),\n+ QMESSAGE_FORMAT_PROGRAM_NAME = (1 << 2),\n };\n \n /**\ndiff --git a/qemu-options.hx b/qemu-options.hx\nindex cdb7fa20c2..84dcbb0983 100644\n--- a/qemu-options.hx\n+++ b/qemu-options.hx\n@@ -5515,13 +5515,15 @@ ERST\n \n DEF(\"msg\", HAS_ARG, QEMU_OPTION_msg,\n \"-msg [timestamp=on|off][,guest-name=on|off]\\n\"\n+ \" [,program-name=on|off]\\n\"\n \" control error message format\\n\"\n \" timestamp=on enables timestamps (default: off)\\n\"\n \" guest-name=on enables guest name prefix but only if\\n\"\n- \" -name guest option is set (default: off)\\n\",\n+ \" -name guest option is set (default: off)\\n\"\n+ \" program-name=off disables program name prefix (default: on)\\n\",\n QEMU_ARCH_ALL)\n SRST\n-``-msg [timestamp=on|off][,guest-name=on|off]``\n+``-msg [timestamp=on|off][,guest-name=on|off][,program-name=on|off]``\n Control error message format.\n \n ``timestamp=on|off``\n@@ -5530,6 +5532,9 @@ SRST\n ``guest-name=on|off``\n Prefix messages with guest name but only if -name guest option is set\n otherwise the option is ignored. Default is off.\n+\n+ ``program-name=on|off``\n+ Prefix messages with the program name. Default is on.\n ERST\n \n DEF(\"dump-vmstate\", HAS_ARG, QEMU_OPTION_dump_vmstate,\ndiff --git a/system/vl.c b/system/vl.c\nindex be5862e55e..3e79bf47e0 100644\n--- a/system/vl.c\n+++ b/system/vl.c\n@@ -381,6 +381,12 @@ static QemuOptsList qemu_msg_opts = {\n .help = \"Prepends guest name for error messages but only if \"\n \"-name guest is set otherwise option is ignored\\n\",\n },\n+ {\n+ .name = \"program-name\",\n+ .type = QEMU_OPT_BOOL,\n+ .help = \"Prepends program name for error messages (enabled \"\n+ \"by default)\\n\",\n+ },\n { /* end of list */ }\n },\n };\n@@ -819,13 +825,16 @@ static void realtime_init(void)\n \n static void configure_msg(QemuOpts *opts)\n {\n- int flags = 0;\n+ int flags = QMESSAGE_FORMAT_PROGRAM_NAME;\n if (qemu_opt_get_bool(opts, \"timestamp\", false)) {\n flags |= QMESSAGE_FORMAT_TIMESTAMP;\n }\n if (qemu_opt_get_bool(opts, \"guest-name\", false)) {\n flags |= QMESSAGE_FORMAT_WORKLOAD_NAME;\n }\n+ if (!qemu_opt_get_bool(opts, \"program-name\", true)) {\n+ flags &= ~QMESSAGE_FORMAT_PROGRAM_NAME;\n+ }\n qmessage_set_format(flags);\n }\n \ndiff --git a/tests/unit/test-error-report.c b/tests/unit/test-error-report.c\nindex 9c63019694..714eafc51e 100644\n--- a/tests/unit/test-error-report.c\n+++ b/tests/unit/test-error-report.c\n@@ -47,7 +47,7 @@ test_error_report_loc(void)\n g_test_trap_subprocess(NULL, 0, 0);\n g_test_trap_assert_passed();\n g_test_trap_assert_stderr(\"\\\n-test-error-report:some-file.c:7717: test error1*\\\n+test-error-report: some-file.c:7717: test error1*\\\n test-error-report: test error2*\\\n \");\n }\n@@ -90,7 +90,8 @@ static void\n test_error_report_timestamp(void)\n {\n if (g_test_subprocess()) {\n- qmessage_set_format(QMESSAGE_FORMAT_TIMESTAMP);\n+ qmessage_set_format(QMESSAGE_FORMAT_TIMESTAMP |\n+ QMESSAGE_FORMAT_PROGRAM_NAME);\n warn_report(\"warn\");\n error_report(\"err\");\n return;\ndiff --git a/util/error-report.c b/util/error-report.c\nindex 3009b93c23..196d51618c 100644\n--- a/util/error-report.c\n+++ b/util/error-report.c\n@@ -179,10 +179,6 @@ static void print_loc(Monitor *cur)\n int i;\n const char *const *argp;\n \n- if (!cur && g_get_prgname()) {\n- fprintf(stderr, \"%s:\", g_get_prgname());\n- sep = \" \";\n- }\n switch (cur_loc->kind) {\n case LOC_CMDLINE:\n argp = cur_loc->ptr;\ndiff --git a/util/message.c b/util/message.c\nindex fb2c947153..dd01bf7462 100644\n--- a/util/message.c\n+++ b/util/message.c\n@@ -5,7 +5,7 @@\n #include \"qemu/message.h\"\n #include \"monitor/monitor.h\"\n \n-static int message_format;\n+static int message_format = QMESSAGE_FORMAT_PROGRAM_NAME;\n static char *message_workloadname;\n \n void qmessage_set_format(int flags)\n@@ -32,4 +32,12 @@ void qmessage_context_print(FILE *fp)\n fputs(message_workloadname, fp);\n fputc(' ', fp);\n }\n+\n+ if (message_format & QMESSAGE_FORMAT_PROGRAM_NAME) {\n+ const char *pgnamestr = g_get_prgname();\n+ if (pgnamestr) {\n+ fputs(pgnamestr, fp);\n+ fputs(\": \", fp);\n+ }\n+ }\n }\n", "prefixes": [ "v6", "25/27" ] }