From nobody Mon Feb 9 10:57:22 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; 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 8.43.85.245 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=1770304047; cv=none; d=zohomail.com; s=zohoarc; b=ku1TwT8j2js1mK0ytXyodYfhP+C0HsgcqKZSH+0waEyF1zfJag1jf6i8yfEnZqwZ/9w3GQ+Rx8CDkJYRq+hvApjp3G86VA730kVMI92ppTqXkJvKTJ2YpuO5f6YLjRwrX6B4glFLbyJLNiGydR34FAvITTA5A7I++3aKEEPqC0M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770304047; 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=sA0k3NPaVepePa16RQi9u8jeXjiwXmxJtBcvuePCxp4=; b=Xd87OpUEVemWy7w1jCZ/eX1VsCvh7dmNJIUQYs7iNBjpY2Wb1DVfCPEORGKy0g+G1lsOHnSwMkXLSIGAjPapzTBmBak2If8pnwOZqVxYuVRguv5gYGr2139VHV6wveQlmppgAS+ga0bjkvqX0mACaV6RXLY06aVjOFE031+EKJk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 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 [8.43.85.245]) by mx.zohomail.com with SMTPS id 1770304047327216.76148866988672; Thu, 5 Feb 2026 07:07:27 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 9B6B041B6B; Thu, 5 Feb 2026 10:07:26 -0500 (EST) Received: from [172.19.199.6] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id F1BD04406A; Thu, 5 Feb 2026 09:59:29 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A30BD41C5F; Thu, 5 Feb 2026 09:59:25 -0500 (EST) 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 C1CFA418E2 for ; Thu, 5 Feb 2026 09:55:46 -0500 (EST) Received: from mx-prod-mc-05.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-103-DJeMRWFwMDKuZm25LgNONg-1; Thu, 05 Feb 2026 09:55:44 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4AAD519560B4 for ; Thu, 5 Feb 2026 14:55:43 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.3]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 942A618003F6 for ; Thu, 5 Feb 2026 14:55:42 +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=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770303346; 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=sA0k3NPaVepePa16RQi9u8jeXjiwXmxJtBcvuePCxp4=; b=PXMwXnxvdwX9/UwQNnalMHgErxPJKxG0gPUrhRJTsK4zxIp/lRLDb2PCdUi6ReHDKn7PZC W/LvfYW8wxRFqQMu0kEaUh3HaS05UNi1tTfYBVgx4J2iSn26s04KQ6Xh6R+y3QHnOYod+3 XJ6cLU4MLMkBWA1j86xdt7iBWde5FgA= X-MC-Unique: DJeMRWFwMDKuZm25LgNONg-1 X-Mimecast-MFC-AGG-ID: DJeMRWFwMDKuZm25LgNONg_1770303343 To: devel@lists.libvirt.org Subject: [PATCH 11/20] qemuMonitorJSONGetBlockInfo: Don't fail if 'io-status' field gets new values Date: Thu, 5 Feb 2026 15:55:19 +0100 Message-ID: <0045bd70135fe6add7be96d7996c0ca6073f6cc1.1770303113.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Z657oMO60hC6WuIrbTcvio0nAxVXPgBkoiCzoHCZfpw_1770303343 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 2YSA47NPEK5FNBFTLBM3HKLSY6RG2RV2 X-Message-ID-Hash: 2YSA47NPEK5FNBFTLBM3HKLSY6RG2RV2 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: 1770304049887154100 Content-Type: text/plain; charset="utf-8" From: Peter Krempa Strictly validating qemu replies and rejecting unknown values can have bad consequences in case qemu adds a new value. Refactor the code parsing 'io-status' field from 'query-block' to be tolerant to new values to avoid failure. Signed-off-by: Peter Krempa --- src/qemu/qemu_monitor.c | 42 -------------------------------- src/qemu/qemu_monitor.h | 3 --- src/qemu/qemu_monitor_json.c | 47 +++++++++++++++++++++++++++++++++--- 3 files changed, 43 insertions(+), 49 deletions(-) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 6acc80832c..1434da7f70 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -177,21 +177,6 @@ VIR_ENUM_IMPL(qemuMonitorVMStatus, "guest-panicked", ); -typedef enum { - QEMU_MONITOR_BLOCK_IO_STATUS_OK, - QEMU_MONITOR_BLOCK_IO_STATUS_FAILED, - QEMU_MONITOR_BLOCK_IO_STATUS_NOSPACE, - - QEMU_MONITOR_BLOCK_IO_STATUS_LAST -} qemuMonitorBlockIOStatus; - -VIR_ENUM_DECL(qemuMonitorBlockIOStatus); - -VIR_ENUM_IMPL(qemuMonitorBlockIOStatus, - QEMU_MONITOR_BLOCK_IO_STATUS_LAST, - "ok", "failed", "nospace", -); - VIR_ENUM_IMPL(qemuMonitorDumpStatus, QEMU_MONITOR_DUMP_STATUS_LAST, "none", "active", "completed", "failed", @@ -1915,33 +1900,6 @@ qemuMonitorSetMemoryStatsPeriod(qemuMonitor *mon, } -int -qemuMonitorBlockIOStatusToError(const char *status) -{ - int st =3D qemuMonitorBlockIOStatusTypeFromString(status); - - if (st < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("unknown block IO status: %1$s"), status); - return -1; - } - - switch ((qemuMonitorBlockIOStatus) st) { - case QEMU_MONITOR_BLOCK_IO_STATUS_OK: - return VIR_DOMAIN_DISK_ERROR_NONE; - case QEMU_MONITOR_BLOCK_IO_STATUS_FAILED: - return VIR_DOMAIN_DISK_ERROR_UNSPEC; - case QEMU_MONITOR_BLOCK_IO_STATUS_NOSPACE: - return VIR_DOMAIN_DISK_ERROR_NO_SPACE; - - /* unreachable */ - case QEMU_MONITOR_BLOCK_IO_STATUS_LAST: - break; - } - return -1; -} - - static void qemuDomainDiskInfoFree(void *value) { diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index 041aa7bc12..a35dbe560f 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -783,9 +783,6 @@ qemuMonitorSetMemoryStatsPeriod(qemuMonitor *mon, virDomainMemballoonDef *balloon, int period); -int -qemuMonitorBlockIOStatusToError(const char *status); - GHashTable * qemuMonitorGetBlockInfo(qemuMonitor *mon); diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 328e32533d..50e0497385 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -2317,6 +2317,24 @@ qemuMonitorJSONBlockInfoAdd(GHashTable *table, } +typedef enum { + QEMU_MONITOR_BLOCK_IO_STATUS_OK, + QEMU_MONITOR_BLOCK_IO_STATUS_FAILED, + QEMU_MONITOR_BLOCK_IO_STATUS_NOSPACE, + + QEMU_MONITOR_BLOCK_IO_STATUS_LAST +} qemuMonitorBlockIOStatus; + +VIR_ENUM_DECL(qemuMonitorBlockIOStatus); + +VIR_ENUM_IMPL(qemuMonitorBlockIOStatus, + QEMU_MONITOR_BLOCK_IO_STATUS_LAST, + "ok", + "failed", + "nospace", +); + + int qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, GHashTable *table) @@ -2329,7 +2347,7 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, for (i =3D 0; i < virJSONValueArraySize(devices); i++) { virJSONValue *dev; - struct qemuDomainDiskInfo info =3D { false }; + struct qemuDomainDiskInfo info =3D { .io_status =3D VIR_DOMAIN_DIS= K_ERROR_NONE }; const char *thisdev; const char *status; const char *qdev; @@ -2358,9 +2376,30 @@ qemuMonitorJSONGetBlockInfo(qemuMonitor *mon, /* Missing io-status indicates no error */ if ((status =3D virJSONValueObjectGetString(dev, "io-status"))) { - info.io_status =3D qemuMonitorBlockIOStatusToError(status); - if (info.io_status < 0) - return -1; + int st =3D qemuMonitorBlockIOStatusTypeFromString(status); + + if (st < 0) { + VIR_WARN("Unhandled value '%s' of 'io-status' field in 'qu= ery-block' reply", + status); + info.io_status =3D VIR_DOMAIN_DISK_ERROR_UNSPEC; + } else { + switch ((qemuMonitorBlockIOStatus) st) { + case QEMU_MONITOR_BLOCK_IO_STATUS_OK: + info.io_status =3D VIR_DOMAIN_DISK_ERROR_NONE; + break; + + case QEMU_MONITOR_BLOCK_IO_STATUS_FAILED: + info.io_status =3D VIR_DOMAIN_DISK_ERROR_UNSPEC; + break; + + case QEMU_MONITOR_BLOCK_IO_STATUS_NOSPACE: + info.io_status =3D VIR_DOMAIN_DISK_ERROR_NO_SPACE; + break; + + case QEMU_MONITOR_BLOCK_IO_STATUS_LAST: + break; + } + } } if (thisdev && --=20 2.53.0