From nobody Mon Sep 21 03:45:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1784735805; cv=none; d=zohomail.com; s=zohoarc; b=TAye1DP4nWGvLvIKj9HiPZhTwotucdlLm66TTtRu6n99Rr3Sliit4RaM+/0D9WIh8wwR1wIDKlwk6DyzS5aWuWEOphsaPRuwhA+bWv4n04Razj2xosafixrkiC2rTB4xPkNn3pzDO0BYu6lW1FKcNk+WieJBhj85Od/InE7tMsc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1784735805; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=W0SHyG5Brgqk/qFzEZtEpH7mMt3qZtOEtsp7myB1x6U=; b=l/AUTgykklODqyU93IlvqLLvsJ4MJmuhA5X9U6Chi+SDo4dDfTfh+OT3KkVisKTaLz+OrYVuBMze7/Q7R8PvOX82ShMcmAPzdc604VTFdjaFIoQSxk3stAz47pZZCQnI/wnBLytkLHX0rArFEiIfc6yjqNKYJ35qgG5vyeswSYk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1784735805759441.0483452435885; Wed, 22 Jul 2026 08:56:45 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id A972541BB8; Wed, 22 Jul 2026 11:56:44 -0400 (EDT) Received: from [172.19.199.10] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id F2F7443FB1; Wed, 22 Jul 2026 11:39:34 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 914A043F04; Wed, 22 Jul 2026 11:39:24 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id B7D4E41D84 for ; Wed, 22 Jul 2026 11:38:35 -0400 (EDT) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39-YT2Y5EJ9NXSxnff6YYggTg-1; Wed, 22 Jul 2026 11:38:33 -0400 Received: from mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.95]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E26BE195604B for ; Wed, 22 Jul 2026 15:38:32 +0000 (UTC) Received: from speedmetal.lan (unknown [10.44.24.17]) by mx-prod-int-10.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E9E142F for ; Wed, 22 Jul 2026 15:38:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=0.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2, RCVD_IN_SBL_CSS,SPF_HELO_PASS autolearn=no autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1784734715; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=W0SHyG5Brgqk/qFzEZtEpH7mMt3qZtOEtsp7myB1x6U=; b=PTKV6bBM/NKceOARKWSQL3xALDWo9Os8f8MQDPWJ++hagKc6jknpejo9wg6ZzQpmQST5Oy X2twmcXT+8VogryAbdyRzp1r7X4XQzXCbaR+28/mvZNK9ESDdQp9YO/JI+GSmnFWBnfSv/ glPm/eQx0O9cNKAi+q7AR5YDHlw4jyI= X-MC-Unique: YT2Y5EJ9NXSxnff6YYggTg-1 X-Mimecast-MFC-AGG-ID: YT2Y5EJ9NXSxnff6YYggTg_1784734713 To: devel@lists.libvirt.org Subject: [PATCH 10/13] qemuMonitorGuestPanicEventInfoFormatMsg: Directly return message Date: Wed, 22 Jul 2026 17:38:15 +0200 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.6 on 10.30.177.95 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 6Q2_tZm9SKChZaU6dSB8BoAy6-TWP8KZmH0Atn1kN24_1784734713 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WSHMYSFUQ3GOYHUZ4MVCA2VEDTYDOQT7 X-Message-ID-Hash: WSHMYSFUQ3GOYHUZ4MVCA2VEDTYDOQT7 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Peter Krempa via Devel Reply-To: Peter Krempa X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1784735806279158500 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Remove the 'ret' variable and format the panic string on a single line. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 59b3671de9..21df06ebd8 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -3881,43 +3881,37 @@ qemuMonitorSetBlockThreshold(qemuMonitor *mon, char * qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfo *info) { - char *ret =3D NULL; - switch (info->type) { case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_HYPERV: - ret =3D g_strdup_printf("hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx'= , " - "arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0= x%llx'", - info->data.hyperv.arg1, info->data.hyperv.ar= g2, - info->data.hyperv.arg3, info->data.hyperv.ar= g4, - info->data.hyperv.arg5); + return g_strdup_printf("hyper-v: arg1=3D'0x%llx', arg2=3D'0x%llx',= arg3=3D'0x%llx', arg4=3D'0x%llx', arg5=3D'0x%llx'", + info->data.hyperv.arg1, info->data.hyperv.a= rg2, + info->data.hyperv.arg3, info->data.hyperv.a= rg4, + info->data.hyperv.arg5); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_S390: - ret =3D g_strdup_printf("s390: core=3D'%d' psw-mask=3D'0x%016llx' " - "psw-addr=3D'0x%016llx' reason=3D'%s'", - info->data.s390.core, - info->data.s390.psw_mask, - info->data.s390.psw_addr, - info->data.s390.reason); + return g_strdup_printf("s390: core=3D'%d' psw-mask=3D'0x%016llx' p= sw-addr=3D'0x%016llx' reason=3D'%s'", + info->data.s390.core, + info->data.s390.psw_mask, + info->data.s390.psw_addr, + info->data.s390.reason); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_TDX: if (info->data.tdx.has_gpa) - ret =3D g_strdup_printf("tdx: error_code=3D'0x%x' message=3D'%= s' " - "additional error information can be fou= nd " - "at gpa page: '0x%016llx'", - info->data.tdx.error_code, - info->data.tdx.message, - info->data.tdx.gpa); + return g_strdup_printf("tdx: error_code=3D'0x%x' message=3D'%s= ' additional error information can be found at gpa page: '0x%016llx'", + info->data.tdx.error_code, + info->data.tdx.message, + info->data.tdx.gpa); else - ret =3D g_strdup_printf("tdx: error_code=3D'0x%x' message=3D'%= s'", - info->data.tdx.error_code, - info->data.tdx.message); + return g_strdup_printf("tdx: error_code=3D'0x%x' message=3D'%s= '", + info->data.tdx.error_code, + info->data.tdx.message); break; case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: break; } - return ret; + return NULL; } --=20 2.55.0