Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/2195642/?format=api
{ "id": 2195642, "url": "http://patchwork.ozlabs.org/api/patches/2195642/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20260211152508.732487-19-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-19-berrange@redhat.com>", "list_archive_url": null, "date": "2026-02-11T15:24:59", "name": "[v6,18/27] monitor: move error_vprintf back to error-report.c", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "0a83cf9affd7ebded2f6c54eb4a139f7538060c7", "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-19-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/2195642/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2195642/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=JRu+rPjg;\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 4fB2QZ54lvz1xtr\n\tfor <incoming@patchwork.ozlabs.org>; Thu, 12 Feb 2026 02:28:54 +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 1vqC7o-000875-Vj; Wed, 11 Feb 2026 10:27:33 -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 1vqC7O-000716-Ne\n for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:27:11 -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 1vqC7N-00063X-1E\n for qemu-devel@nongnu.org; Wed, 11 Feb 2026 10:27:06 -0500", "from mx-prod-mc-03.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-219-DCbKbnZdM9yzo4sA-KOGZg-1; Wed,\n 11 Feb 2026 10:27:01 -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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS\n id 79B871955E7E; Wed, 11 Feb 2026 15:26:59 +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 30A9F30002D8; Wed, 11 Feb 2026 15:26:53 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1770823624;\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=S8FwGsc+U4X0RJkMPuDd8AeKnsrsM8ODFDWU/OsmlDA=;\n b=JRu+rPjgMn6bxBxgb1YhtGjTRsfJ2q0K5RmTDu7+MJ3uXYp6lbGZaltYMDCQbCAoKloujc\n vIoo6vd9erkmdreUiv1dBaKJvdcH6BjBWfWLfCgq8Q0bS1yDVYXVjwWKkGaFi+hqIBWpog\n CSxRtyTCm/xbvm4KwwbnEniupmrZX4w=", "X-MC-Unique": "DCbKbnZdM9yzo4sA-KOGZg-1", "X-Mimecast-MFC-AGG-ID": "DCbKbnZdM9yzo4sA-KOGZg_1770823619", "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>,\n Eric Blake <eblake@redhat.com>", "Subject": "[PATCH v6 18/27] monitor: move error_vprintf back to error-report.c", "Date": "Wed, 11 Feb 2026 15:24:59 +0000", "Message-ID": "<20260211152508.732487-19-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,\n SPF_PASS=-0.001 autolearn=unavailable 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 current unit tests rely on monitor.o not being linked, such\nthat the monitor stubs get linked instead. Since error_vprintf\nis in monitor.o this allows a stub error_vprintf impl to be used\nthat calls g_test_message.\n\nThis takes a different approach, with error_vprintf moving\nback to error-report.c such that it is always linked into the\ntests. The monitor_vprintf() stub is then changed to use\ng_test_message if QTEST_SILENT_ERRORS is set, otherwise it will\nreturn -1 and trigger error_vprintf to call vfprintf.\n\nThe end result is functionally equivalent for the purposes of\nthe unit tests.\n\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nReviewed-by: Eric Blake <eblake@redhat.com>\nReviewed-by: Markus Armbruster <armbru@redhat.com>\nSigned-off-by: Daniel P. Berrangé <berrange@redhat.com>\n---\n monitor/monitor.c | 18 ------------------\n stubs/error-printf.c | 18 ------------------\n stubs/meson.build | 1 -\n stubs/monitor-core.c | 14 +++++++++++++-\n util/error-report.c | 18 ++++++++++++++++++\n 5 files changed, 31 insertions(+), 38 deletions(-)\n delete mode 100644 stubs/error-printf.c", "diff": "diff --git a/monitor/monitor.c b/monitor/monitor.c\nindex 64c552a047..6dc5a7016d 100644\n--- a/monitor/monitor.c\n+++ b/monitor/monitor.c\n@@ -268,24 +268,6 @@ void monitor_printc(Monitor *mon, int c)\n monitor_printf(mon, \"'\");\n }\n \n-/*\n- * Print to the current human monitor if we have one, else to stderr.\n- */\n-int error_vprintf(const char *fmt, va_list ap)\n-{\n- Monitor *cur_mon = monitor_cur();\n- /*\n- * This will return -1 if 'cur_mon' is NULL, or is QMP.\n- * IOW this will only print if in HMP, otherwise we\n- * fallback to stderr for QMP / no-monitor scenarios.\n- */\n- int ret = monitor_vprintf(cur_mon, fmt, ap);\n- if (ret == -1) {\n- ret = vfprintf(stderr, fmt, ap);\n- }\n- return ret;\n-}\n-\n static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {\n /* Limit guest-triggerable events to 1 per second */\n [QAPI_EVENT_RTC_CHANGE] = { 1000 * SCALE_MS },\ndiff --git a/stubs/error-printf.c b/stubs/error-printf.c\ndeleted file mode 100644\nindex 1afa0f62ca..0000000000\n--- a/stubs/error-printf.c\n+++ /dev/null\n@@ -1,18 +0,0 @@\n-#include \"qemu/osdep.h\"\n-#include \"qemu/error-report.h\"\n-#include \"monitor/monitor.h\"\n-\n-int error_vprintf(const char *fmt, va_list ap)\n-{\n- int ret;\n-\n- if (g_test_initialized() && !g_test_subprocess() &&\n- getenv(\"QTEST_SILENT_ERRORS\")) {\n- char *msg = g_strdup_vprintf(fmt, ap);\n- g_test_message(\"%s\", msg);\n- ret = strlen(msg);\n- g_free(msg);\n- return ret;\n- }\n- return vfprintf(stderr, fmt, ap);\n-}\ndiff --git a/stubs/meson.build b/stubs/meson.build\nindex 8a07059500..354bf97d74 100644\n--- a/stubs/meson.build\n+++ b/stubs/meson.build\n@@ -3,7 +3,6 @@\n # below, so that it is clear who needs the stubbed functionality.\n \n stub_ss.add(files('cpu-get-clock.c'))\n-stub_ss.add(files('error-printf.c'))\n stub_ss.add(files('fdset.c'))\n stub_ss.add(files('iothread-lock.c'))\n stub_ss.add(files('is-daemonized.c'))\ndiff --git a/stubs/monitor-core.c b/stubs/monitor-core.c\nindex 1894cdfe1f..a7c32297c9 100644\n--- a/stubs/monitor-core.c\n+++ b/stubs/monitor-core.c\n@@ -18,5 +18,17 @@ void qapi_event_emit(QAPIEvent event, QDict *qdict)\n \n int monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)\n {\n- abort();\n+ /*\n+ * Pretend 'g_test_message' is our monitor console to\n+ * stop the caller sending messages to stderr\n+ */\n+ if (g_test_initialized() && !g_test_subprocess() &&\n+ getenv(\"QTEST_SILENT_ERRORS\")) {\n+ char *msg = g_strdup_vprintf(fmt, ap);\n+ g_test_message(\"%s\", msg);\n+ size_t ret = strlen(msg);\n+ g_free(msg);\n+ return ret;\n+ }\n+ return -1;\n }\ndiff --git a/util/error-report.c b/util/error-report.c\nindex 1b17c11de1..f3aa24ec22 100644\n--- a/util/error-report.c\n+++ b/util/error-report.c\n@@ -29,6 +29,24 @@ bool message_with_timestamp;\n bool error_with_guestname;\n const char *error_guest_name;\n \n+/*\n+ * Print to the current human monitor if we have one, else to stderr.\n+ */\n+int error_vprintf(const char *fmt, va_list ap)\n+{\n+ Monitor *cur_mon = monitor_cur();\n+ /*\n+ * This will return -1 if 'cur_mon' is NULL, or is QMP.\n+ * IOW this will only print if in HMP, otherwise we\n+ * fallback to stderr for QMP / no-monitor scenarios.\n+ */\n+ int ret = monitor_vprintf(cur_mon, fmt, ap);\n+ if (ret == -1) {\n+ ret = vfprintf(stderr, fmt, ap);\n+ }\n+ return ret;\n+}\n+\n int error_printf(const char *fmt, ...)\n {\n va_list ap;\n", "prefixes": [ "v6", "18/27" ] }