From nobody Tue Sep 9 03:17:51 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=1746601793; cv=none; d=zohomail.com; s=zohoarc; b=WbIqTvX2LBGWb+tMkYD+yCEH6rcAbV+iyJYJT2r+rAU9LCPOiAQgU4+Ki9g4PWSNrjmvRNsl+vmDRTn6WYbNJKorequQWSIUEOd8nMBjm3HeH9nsZsy7JW9AHkBi3p6/RuaDgS/Z9Y8jpdKh41i1NHY/aT9QtAnQYB+qUxLX8RU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746601793; h=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=xJU9QtnBs/Agiw9jB5QQjE8Ld88Iju+YF5g5rO1ntZI=; b=hLJHyVy741L7viGy7JV/6r7tvptBxJcA1yzTYkFhn5vZYkwmqtFOYiXnWxjgKX35dzciSjEyiMzca12aFOVOXL8jdSs6reHg8WF+HsQWVEHAQdf5UqarAsNDnkKKq2KL5tD13bIKeO6l2GKv84fzETCX7Nf1pUwDDjiwMVUaOE8= 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 1746601793623940.4766135564087; Wed, 7 May 2025 00:09:53 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id EBF6914EA; Wed, 7 May 2025 03:09:52 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id 11E3714FA; Wed, 7 May 2025 03:09:37 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 68A8614D6; Wed, 7 May 2025 03:09:33 -0400 (EDT) Received: from mx.swemel.ru (mx.swemel.ru [95.143.211.150]) (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 3CE2B14D8 for ; Wed, 7 May 2025 03:09:32 -0400 (EDT) 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_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=swemel.ru; s=mail; t=1746601764; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9P7WVIufk76m6KnMNGaay4iuq67q6g0SPS+smx3Z5uU=; b=ibO4Ki5ymBhDZy0Wi3s7u5YQzxHInNq569hfzzDN5KD5MK/xAh2I6RWV+K58h9IFxCsrqA B3JEBbmhHOxYr3Uu1qpiq6xQVx0lHfNox7r8FmCAfqAEO/9BmxJKT4GQG+7APJx/arY+s5 +uHiTa4fxcVvmGnpal3jRHZvMiHnIZE= To: devel@lists.libvirt.org Subject: [PATCH v2] qemu: fix qemuMigrationCapability enum Date: Wed, 7 May 2025 10:07:41 +0300 Message-Id: <20250507070740.1372119-1-frolov@swemel.ru> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: H5NUAQ4N222NTNPGKPDQYGFWVKO6ACJ2 X-Message-ID-Hash: H5NUAQ4N222NTNPGKPDQYGFWVKO6ACJ2 X-MailFrom: frolov@swemel.ru 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: sdl.libvirt@linuxtesting.org, Dmitry Frolov 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: Dmitry Frolov via Devel Reply-To: Dmitry Frolov X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1746601795942019000 Content-Type: text/plain; charset="utf-8" Enum variable of type qemuMigrationCapability is checked for zero in src/qemu/qemu_migration_params.c:729. "if (item->optional) { ..." Actualy, QEMU_MIGRATION_CAP_XBZRLE enum constant has value 0. So, at least, the condition is incorrect. v1: introducing a separate enum for optional capabilities v2: another approach: fix only the incorrect condition Found by Linux Verification Center (linuxtesting.org) with SVACE. Signed-off-by: Dmitry Frolov --- src/qemu/qemu_migration_params.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_par= ams.c index c10660d6f2..98d314cf2d 100644 --- a/src/qemu/qemu_migration_params.c +++ b/src/qemu/qemu_migration_params.c @@ -700,6 +700,12 @@ qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigr= ationParams *migParams, ignore_value(virBitmapClearBit(migParams->caps, QEMU_MIGRATION_CAP= _BLOCK_DIRTY_BITMAPS)); } =20 +static bool +qemuMigrationCapabilityIsOptional(qemuMigrationCapability cap) +{ + return cap =3D=3D QEMU_MIGRATION_CAP_POSTCOPY_PREEMPT || + cap =3D=3D QEMU_MIGRATION_CAP_SWITCHOVER_ACK; +} =20 qemuMigrationParams * qemuMigrationParamsFromFlags(virTypedParameterPtr params, @@ -725,7 +731,7 @@ qemuMigrationParamsFromFlags(virTypedParameterPtr param= s, qemuMigrationCapabilityTypeToString(item->cap)); ignore_value(virBitmapSetBit(migParams->caps, item->cap)); =20 - if (item->optional) { + if (qemuMigrationCapabilityIsOptional(item->optional)) { qemuMigrationCapability opt =3D item->optional; ignore_value(virBitmapSetBit(migParams->optional, opt)); if (item->party !=3D party) --=20 2.34.1