From nobody Wed Dec 17 08:55:22 2025 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=1744372733; cv=none; d=zohomail.com; s=zohoarc; b=T/bCyYLz+DBOc4iLlVILV7VXzp56hlW9ldmZDkQ7KZQUxqeIPzf2onJ6GbC4xloV1FHuO4SMOEjAt1EpwPmU3ltel6v2BeEz1nbrKA9xu8SGbGCcAParzCswKNTCBW+ajSNZsn5k5QbNmPU+kJ7Jtdvevg1ZxzdsAkwjGu8/4e8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1744372733; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id; bh=4Ua9CJ9M3KBZrh8MbmFle1A7ZmC2gpxaoNGzxpZUkS4=; b=Qvp+EuO2WPmx/v44Paj4uFClavYWuo6ka6iZuFxSetMU8fbYzGwyr7yRgFMJJnJ0lPF6v1Sf+URrvyWXpZJM/fzCU6xzkBm93wuTWBUDhidlWFMrIOElF4si+0J0xULNXLXJ5KTjmGibTSDRZSNnwU9XjUOGTIxzwSfsvEZx9Ys= 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 174437273394569.76094256192664; Fri, 11 Apr 2025 04:58:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 5A81418D1; Fri, 11 Apr 2025 07:58:53 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C8CB21900; Fri, 11 Apr 2025 07:58:07 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id C1CCA1826; Fri, 11 Apr 2025 07:58:00 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 45D29DC5 for ; Fri, 11 Apr 2025 07:58:00 -0400 (EDT) Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-203-Py1jJPfDMYSr2lrUBspA6Q-1; Fri, 11 Apr 2025 07:57:58 -0400 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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 085BB18007E1 for ; Fri, 11 Apr 2025 11:57:58 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.44.22.8]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 040CF1808882; Fri, 11 Apr 2025 11:57:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744372680; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=U9SIwh4CQtJfs9kd+EWhf8bHfjX3uJ2xyIrDd0U4lgA=; b=Im+dMVPyxY68Mf3Ahq5OMBgjo5uf/Er2HuFsGuNeofawc5iSKaxEbJ7mIXikZFzr/ctzgO AcK9PcBgJ7UseeJTZMv7FlDqOj3Io2y0BTprZhbs3X47sz9DsOEtDOiMB9yvoTT4rYWBZ/ 0v8V2WL+BbrUxoPJHxhq//fiqeTgogw= X-MC-Unique: Py1jJPfDMYSr2lrUBspA6Q-1 X-Mimecast-MFC-AGG-ID: Py1jJPfDMYSr2lrUBspA6Q_1744372678 To: devel@lists.libvirt.org Subject: [PATCH 2/3] qemuDomainAttachDiskGeneric: Report errors from 'qemuBuildThrottleFiltersAttachPrepareBlockdev' Date: Fri, 11 Apr 2025 13:57:50 +0200 Message-ID: <0bbf4cd45fdcf250da45889365800eeaaebddbff.1744372647.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: pq-k9Y2yTa0LdbDGMKURZuLaMad1gP6h1vdc1Xg-0ng_1744372678 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: D7MKUHR2724MGVACTFD4MPYWDVCZM2T5 X-Message-ID-Hash: D7MKUHR2724MGVACTFD4MPYWDVCZM2T5 X-MailFrom: pkrempa@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: Peter Krempa X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: 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: 1744372735093019000 Content-Type: text/plain; charset="utf-8" From: Peter Krempa 'qemuBuildThrottleFiltersAttachPrepareBlockdev' can fail when constructing JSON props, but otherwise always retruns a pointer even if there's nothing to do. The code in 'qemuDomainAttachDiskGeneric' didn't handle this properly as it considered NULL as "nothing to do". Return the failure instead and check if tere's something to do by looking at 'nfilterdata' Signed-off-by: Peter Krempa --- src/qemu/qemu_hotplug.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 9977662a2c..02636c9531 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -740,10 +740,15 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm, if (rc < 0) goto rollback; - if ((filterData =3D qemuBuildThrottleFiltersAttachPrepareBlockdev(= disk))) { + if (!(filterData =3D qemuBuildThrottleFiltersAttachPrepareBlockdev= (disk))) + return -1; + + if (filterData->nfilterdata > 0) { if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return -1; + rc =3D qemuBlockThrottleFiltersAttach(priv->mon, filterData); + qemuDomainObjExitMonitor(vm); if (rc < 0) goto rollback; --=20 2.49.0