From nobody Sun Sep 28 16:35:29 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1756572999; cv=none; d=zohomail.com; s=zohoarc; b=DJSCv2QR6WYJn2QstouqD8NK5c2ygUrLMt+qgEgsAnS4yx+UXsDOLh6kQUv/kwYPchMViip1FFSihEEO5kiet2eqjAT/ZbE3K3gEm2H1+zmhbrPVJ0K6CKp/kIgqHNwb6NQjqQxQJLGZKwRsdwtKPvuooM7o8LxE+Es6EX8Q0Po= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756572999; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=BSdjMYWo+86VX8GX3Xm4s2LHLgpFxbBibOQ/p953Ays=; b=lY05x5IWYKwSr9OPctZUw3B3xvpPbliA/nVRfLY8fdFtJrT2zGLkwFSjGE0TAeAwBuIQJpodlX/y/gx/WH4s77dlRV0M1Ruq3joxff/YL/zJlICNMwv/xJel2IHa2Mn6DIuGeO3ir7h++cZVVf59wOSz+LloJiwODqoHjgb/k2Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756572999292517.4686401830215; Sat, 30 Aug 2025 09:56:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNFW-0006RI-MK; Sat, 30 Aug 2025 11:12:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1urwy9-0008TI-7b for qemu-devel@nongnu.org; Fri, 29 Aug 2025 07:08:33 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1urwy7-0001hh-Ls for qemu-devel@nongnu.org; Fri, 29 Aug 2025 07:08:32 -0400 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-30-6wZ0-10JN12Z8Tt9Cl6ZIQ-1; Fri, 29 Aug 2025 07:08:26 -0400 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 A9342195E908; Fri, 29 Aug 2025 11:08:24 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.225.62]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2234730001B5; Fri, 29 Aug 2025 11:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756465710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BSdjMYWo+86VX8GX3Xm4s2LHLgpFxbBibOQ/p953Ays=; b=Akr8ZEoCf2B/mpFMQUAYEjc0x4PffkD6d1gcI9N4jNaR1xm/aa7k1CeFX7MMiewR49+D/k jJjsPr6cMtk3hHFPdxT8V3YQg0vRdTcX8NieElj+jCVUDxgWTjsAoiM6zOlO+in7zZiZvd n2+rRgUvY6rMOVDXfAduuHNLBF5yyxk= X-MC-Unique: 6wZ0-10JN12Z8Tt9Cl6ZIQ-1 X-Mimecast-MFC-AGG-ID: 6wZ0-10JN12Z8Tt9Cl6ZIQ_1756465704 From: Kostiantyn Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Richard Henderson , Stefan Hajnoczi Subject: [PULL 3/9] qga-vss: Replace asserts with condition and report error Date: Fri, 29 Aug 2025 14:08:07 +0300 Message-ID: <20250829110813.50286-4-kkostiuk@redhat.com> In-Reply-To: <20250829110813.50286-1-kkostiuk@redhat.com> References: <20250829110813.50286-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=kkostiuk@redhat.com; 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1756573001705124100 Content-Type: text/plain; charset="utf-8" Reviewed-by: Yan Vugenfirer Link: https://lore.kernel.org/qemu-devel/20250825145241.170717-2-kkostiuk@r= edhat.com Signed-off-by: Kostiantyn Kostiuk --- qga/vss-win32/requester.cpp | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp index 4401d55e3a..bc260abb96 100644 --- a/qga/vss-win32/requester.cpp +++ b/qga/vss-win32/requester.cpp @@ -347,7 +347,12 @@ void requester_freeze(int *num_vols, void *mountpoints= , ErrorSet *errset) goto out; } =20 - assert(pCreateVssBackupComponents !=3D NULL); + if (!pCreateVssBackupComponents) { + err_set(errset, (HRESULT)ERROR_PROC_NOT_FOUND, + "CreateVssBackupComponents proc address absent. Did you ca= ll requester_init()?"); + goto out; + } + hr =3D pCreateVssBackupComponents(&vss_ctx.pVssbc); if (FAILED(hr)) { err_set(errset, hr, "failed to create VSS backup components"); @@ -579,8 +584,16 @@ void requester_thaw(int *num_vols, void *mountpints, E= rrorSet *errset) /* Tell the provider that the snapshot is finished. */ SetEvent(vss_ctx.hEventThaw); =20 - assert(vss_ctx.pVssbc); - assert(vss_ctx.pAsyncSnapshot); + if (!vss_ctx.pVssbc) { + err_set(errset, (HRESULT)VSS_E_BAD_STATE, + "CreateVssBackupComponents is missing. Did you freeze the = volumes?"); + return; + } + if (!vss_ctx.pAsyncSnapshot) { + err_set(errset, (HRESULT)VSS_E_BAD_STATE, + "AsyncSnapshot set is missing. Did you freeze the volumes?= "); + return; + } =20 HRESULT hr =3D WaitForAsync(vss_ctx.pAsyncSnapshot); switch (hr) { --=20 2.50.1