From nobody Sat Nov 15 14:52:49 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=1750189342; cv=none; d=zohomail.com; s=zohoarc; b=QaejO6gZQDpvsgsUYRjOrxBqmaaT0fta0FiC1aRwCcvE/0gOE1RCwTYze5soEJ2if7Ry1S8Bw/ZFkScYF4Aih+ADqIkcQVsNg2I5nXTXiIEJ6gaPknMolMIrc2XA0WIYPnq5ef3HWumdwBOgINXLPrnf6qsC54jiADCdK5ggbDw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1750189342; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=EzYtFa1YUKp//aYusIzs3ctNZNvbTt0+bjSRID6VUpE=; b=P+8FuyGktRH4THf1CIxsppAx7ioY0jQHjt0rDdvGGCVicxtuh+R2j7cyyiu1ldlNzLuhqyYJ51cemoLzCLv7UADirlllPWh4wHG/tN5RLVPOC0OvaE/pm7Sr4Hdc3JtOIoxmZJpcDzrmhJHKkZqVbcJhcN58OEJZ7KEXKl0P74s= 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 1750189342930489.84039843041535; Tue, 17 Jun 2025 12:42:22 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uRcBS-0004ty-Cl; Tue, 17 Jun 2025 15:41:26 -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 1uRaQY-0006ux-Di for qemu-devel@nongnu.org; Tue, 17 Jun 2025 13:48:56 -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 1uRaQU-0001Dv-JG for qemu-devel@nongnu.org; Tue, 17 Jun 2025 13:48:53 -0400 Received: from mx-prod-mc-01.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-450-nOZGWet1PASGNQNUG-_GlQ-1; Tue, 17 Jun 2025 13:47:40 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 30E801956094; Tue, 17 Jun 2025 17:47:39 +0000 (UTC) Received: from eashurov-thinkpadx1carbongen12.raanaii.csb (unknown [10.47.238.56]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2E766195608F; Tue, 17 Jun 2025 17:47:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750182528; 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; bh=EzYtFa1YUKp//aYusIzs3ctNZNvbTt0+bjSRID6VUpE=; b=Jx2jlWjMKURK2+70hhVhVa0e3Y5DVgnGdJw4LQhLUaRV6ZiQlnGYiciL45pyMt5iqsprDn 2eCTAdWSgEJmRNmiKDNtOG4UyPgt7erEfIvbqInwrF/TqxZb31kvDyAFzOYfvoX1RkYs1F L/7KvQ6ZtCE+ZPVmiDe5awdjOwcWH3U= X-MC-Unique: nOZGWet1PASGNQNUG-_GlQ-1 X-Mimecast-MFC-AGG-ID: nOZGWet1PASGNQNUG-_GlQ_1750182459 From: Elizabeth Ashurov To: qemu-devel@nongnu.org Cc: Michael Roth , Konstantin Kostiuk , Elizabeth Ashurov Subject: [PATCH] qga/vss-win32: Add VSS provider unregistration retry Date: Tue, 17 Jun 2025 20:47:33 +0300 Message-ID: <20250617174733.156349-1-eashurov@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=eashurov@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -39 X-Spam_score: -4.0 X-Spam_bar: ---- X-Spam_report: (-4.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.89, 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_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Tue, 17 Jun 2025 15:41:22 -0400 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: 1750189344624116600 Content-Type: text/plain; charset="utf-8" This commit improves the QGA VSS provider installation flow by attempting to unregister the VSS provider if it's already found during installation. This allows for a retry of installation even if a previous unregistration failed or was not performed. Signed-off-by: Elizabeth Ashurov --- qga/vss-win32/install.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 5cea5bcf74..a136d46050 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -263,6 +263,7 @@ STDAPI COMRegister(void) qga_debug_begin; =20 HRESULT hr; + HRESULT unregisterHr; COMInitializer initializer; COMPointer pUnknown; COMPointer pCatalog; @@ -287,9 +288,13 @@ STDAPI COMRegister(void) =20 chk(QGAProviderFind(QGAProviderCount, (void *)&count)); if (count) { - errmsg(E_ABORT, "QGA VSS Provider is already installed"); - qga_debug_end; - return E_ABORT; + qga_debug("QGA VSS Provider is already installed. Attempting to un= register first."); + unregisterHr =3D COMUnregister(); + if (FAILED(unregisterHr)) { + errmsg(unregisterHr, "Failed to unregister existing QGA VSS Pr= ovider. Aborting installation."); + qga_debug_end; + return E_ABORT;=20 + } } =20 chk(CoCreateInstance(CLSID_COMAdminCatalog, NULL, CLSCTX_INPROC_SERVER, --=20 2.49.0