From nobody Sat Nov 15 14:12:04 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=1751372827; cv=none; d=zohomail.com; s=zohoarc; b=ATGC7p9Gizg/+mLn0FjpXy00/bjmvtRT1ysTxPtIqPV855PMYAF9/5/bKfJn6szZoBfW8Xro8Wy/gez8P0pglDD3PnuRHiMsXXIRKx8itwLPcVvrgumklSqKQ0RmGShr0YT5NAI8TM2CowcBzoSa52iIymr0okuP9kDp4eQssJc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751372827; 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:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3OLHN4+BZ2OHzqalRV2YRaGJ6fy4BS9UhG9Jq56005w=; b=X/fI+WLtOAJ8JFCH4+GBSFxyUIsfLwe9Xt3IooTGCRSL4GoTZ1HIvaw6blJsSKTuORHxGwSVF21KcitdjhjSrSQHG43gKat8G8bcJsN+cJhHVRh9+msdU5Net61EH70hJpyJUyGiiV7t6Ol7YDQCwrE2zAPIdblZ0u9BXFNwUPo= 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 1751372827443731.2483036630417; Tue, 1 Jul 2025 05:27:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uWa4L-0007UN-2E; Tue, 01 Jul 2025 08:26:40 -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 1uWa4D-0007RI-3N for qemu-devel@nongnu.org; Tue, 01 Jul 2025 08:26:31 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uWa43-0007IO-1O for qemu-devel@nongnu.org; Tue, 01 Jul 2025 08:26:28 -0400 Received: from mx-prod-mc-04.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-549-IKj1N02hOsiZhTxtUlfm8g-1; Tue, 01 Jul 2025 08:26:15 -0400 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C98AD19560A2; Tue, 1 Jul 2025 12:26:14 +0000 (UTC) Received: from srv1.redhat.com (unknown [10.45.225.98]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2735619560A7; Tue, 1 Jul 2025 12:26:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751372776; 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=3OLHN4+BZ2OHzqalRV2YRaGJ6fy4BS9UhG9Jq56005w=; b=dMnyPrXWf917h26uPdEkE6vymKL0z/G8Yr6MksOooQVEuc7S9DvJ0xwI32h8eIGKQmLf7D n29aFmtcVDa06cu9c5WV4nGt0OBqxfVBueIgRXHZCV/BxgBuqqXKyKmyd9IsdZDGhgpJs5 tMYq6Ih5iLOosCPLpOxtb6bqn036ZmM= X-MC-Unique: IKj1N02hOsiZhTxtUlfm8g-1 X-Mimecast-MFC-AGG-ID: IKj1N02hOsiZhTxtUlfm8g_1751372774 From: Kostiantyn Kostiuk To: qemu-devel@nongnu.org, Peter Maydell , Stefan Hajnoczi Cc: Yan Vugenfirer , Dehan Meng , Elizabeth Ashurov , Kostiantyn Kostiuk Subject: [PULL 3/3] qga/vss-win32: Add VSS provider unregistration retry Date: Tue, 1 Jul 2025 15:25:58 +0300 Message-ID: <20250701122558.31556-4-kkostiuk@redhat.com> In-Reply-To: <20250701122558.31556-1-kkostiuk@redhat.com> References: <20250701122558.31556-1-kkostiuk@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 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.129.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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=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: 1751372833939116600 Content-Type: text/plain; charset="utf-8" From: Elizabeth Ashurov This commit improves the QGA VSS provider installation flow by attempting t= o 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. This will prevent inconsistencies between QGA and QGA-VSS versions. Before this commit, QGA can use QGA-VSS from the previous installation. Signed-off-by: Elizabeth Ashurov Reviewed-by: Kostiantyn Kostiuk Message-ID: <20250618091806.170110-1-eashurov@redhat.com> Signed-off-by: Kostiantyn Kostiuk --- qga/vss-win32/install.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 6ee2f44a10..7b25d9098b 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -287,9 +287,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."); + hr =3D COMUnregister(); + if (FAILED(hr)) { + errmsg(hr, "Failed to unregister existing QGA VSS Provider. Ab= orting installation."); + qga_debug_end; + return E_ABORT; + } } =20 chk(CoCreateInstance(CLSID_COMAdminCatalog, NULL, CLSCTX_INPROC_SERVER, --=20 2.48.1