diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2025-07-02 04:24:03 -0400 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2025-07-02 04:24:03 -0400 |
| commit | f7c8df571859223c00d1ed1249d7a22f0e30f9d6 (patch) | |
| tree | 27a4ae46ab1ce5764c9b1a0fa4d47b43b81abea1 | |
| parent | 6138e72b7e33e0240ee955a2754dd038ee99494d (diff) | |
| parent | 1c90e89e64beb2bd72f8e437c56274c885df7b3f (diff) | |
| download | qemu-f7c8df571859223c00d1ed1249d7a22f0e30f9d6.zip qemu-f7c8df571859223c00d1ed1249d7a22f0e30f9d6.tar.gz qemu-f7c8df571859223c00d1ed1249d7a22f0e30f9d6.tar.bz2 | |
Merge tag 'qga-pull-2025-07-01' of https://github.com/kostyanf14/qemu into staging
qga-pull-2025-07-01
# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEwsLBCepDxjwUI+uE711egWG6hOcFAmhj0ygACgkQ711egWG6
# hOfapA//VwouBLZL0LvytJSm2kSjwkzYGCcEwnvywjrVwhVBUI0BpV6MeWg3uZ6i
# 51wgFLrjLEiqFdYAPv9OyBM8mZe7iZ4G4vvTHeajwrdxGWQ241N6eg1zcmXhawiR
# NqvcdccIJmjtbb92VpbcXv2viZGsLBCn44Cv3GODpOPu1C/LUuNBo7YY8DL20ta2
# j9ojWauO3Qih1TadToPTUQ9Mu8Ysh86osKshq+XUIGO1y+Rgb7VYMbPg5dbVFxm0
# OPAmO+lIEh79jBwaITPE4wSlQVNZ8CoMbnS6jBYFDTw9ybi+Klr3NUQQkzc+ATbZ
# 1ybvtlpy9Ungqxa3A5nFqVgRhs+x6k9q+yQNL9dsOOtEJDVJdHKz5CgoJgrHMCdV
# jSKA00T49iTcSrvjCOv8SSY0Tey9HVmLBJ5Gl1WKZzpUfSz/W/aqNNHnfEf25GYN
# OhMei7nSi8y76TrTVize378UOctKQbWDaXfnzCHiLoNxioVg4Kl3iooLqsMA8oth
# EXfHbpz5xl2gRDp7KshU5xB0dL5LrWoN+Qo+9FiPZmXY7Yw1xflFNXTLvp8b2lQV
# 4y7AiZMY+dalENuGk0SyuP8STucDayc0pSSNTCY0vsi1+cC0NHixg9paO1xiCkNG
# asefLMQf2lP/zcoahVCGEK0IY6GSmnKy1dV0zFpFeVg7KN8geF0=
# =ON5m
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 01 Jul 2025 08:23:04 EDT
# gpg: using RSA key C2C2C109EA43C63C1423EB84EF5D5E8161BA84E7
# gpg: Good signature from "Kostiantyn Kostiuk (Upstream PR sign) <kkostiuk@redhat.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: C2C2 C109 EA43 C63C 1423 EB84 EF5D 5E81 61BA 84E7
* tag 'qga-pull-2025-07-01' of https://github.com/kostyanf14/qemu:
qga/vss-win32: Add VSS provider unregistration retry
qga-vss: Exit with non-zero code when register fail
MAINTAINERS: Update Kostiantyn Kostiuk transliteration
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | MAINTAINERS | 4 | ||||
| -rw-r--r-- | qga/vss-win32/install.cpp | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d1672fd..4cfb587 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3383,7 +3383,7 @@ T: git https://repo.or.cz/qemu/armbru.git qapi-next QEMU Guest Agent M: Michael Roth <michael.roth@amd.com> -M: Konstantin Kostiuk <kkostiuk@redhat.com> +M: Kostiantyn Kostiuk <kkostiuk@redhat.com> S: Maintained F: qga/ F: contrib/systemd/qemu-guest-agent.service @@ -3394,7 +3394,7 @@ F: tests/*/test-qga* T: git https://github.com/mdroth/qemu.git qga QEMU Guest Agent Win32 -M: Konstantin Kostiuk <kkostiuk@redhat.com> +M: Kostiantyn Kostiuk <kkostiuk@redhat.com> S: Maintained F: qga/*win32* F: qga/vss-win32/ diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp index 5cea5bc..7b25d90 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, @@ -385,7 +389,10 @@ out: STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int); STDAPI_(void) CALLBACK DLLCOMRegister(HWND, HINSTANCE, LPSTR, int) { - COMRegister(); + HRESULT hr = COMRegister(); + if (FAILED(hr)) { + exit(hr); + } } STDAPI_(void) CALLBACK DLLCOMUnregister(HWND, HINSTANCE, LPSTR, int); |