From: Elizabeth Ashurov Date: Wed, 18 Jun 2025 09:18:06 +0000 (+0300) Subject: qga/vss-win32: Add VSS provider unregistration retry X-Git-Tag: v10.1.0-rc0~38^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c90e89e64beb2bd72f8e437c56274c885df7b3f;p=thirdparty%2Fqemu.git qga/vss-win32: Add VSS provider unregistration retry 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. 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 --- diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 6ee2f44a104..7b25d9098ba 100644 --- a/qga/vss-win32/install.cpp +++ b/qga/vss-win32/install.cpp @@ -287,9 +287,13 @@ STDAPI COMRegister(void) 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 unregister first."); + hr = COMUnregister(); + if (FAILED(hr)) { + errmsg(hr, "Failed to unregister existing QGA VSS Provider. Aborting installation."); + qga_debug_end; + return E_ABORT; + } } chk(CoCreateInstance(CLSID_COMAdminCatalog, NULL, CLSCTX_INPROC_SERVER,