From: Kostiantyn Kostiuk <kkostiuk@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>,
Richard Henderson <richard.henderson@linaro.org>
Subject: [PULL v2 3/9] qga-vss: Replace asserts with condition and report error
Date: Mon, 1 Sep 2025 14:24:07 +0300 [thread overview]
Message-ID: <20250901112413.114314-4-kkostiuk@redhat.com> (raw)
In-Reply-To: <20250901112413.114314-1-kkostiuk@redhat.com>
Reviewed-by: Yan Vugenfirer <yvugenfi@redhat.com>
Link: https://lore.kernel.org/qemu-devel/20250825145241.170717-2-kkostiuk@redhat.com
Signed-off-by: Kostiantyn Kostiuk <kkostiuk@redhat.com>
---
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;
}
- assert(pCreateVssBackupComponents != NULL);
+ if (!pCreateVssBackupComponents) {
+ err_set(errset, (HRESULT)ERROR_PROC_NOT_FOUND,
+ "CreateVssBackupComponents proc address absent. Did you call requester_init()?");
+ goto out;
+ }
+
hr = 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, ErrorSet *errset)
/* Tell the provider that the snapshot is finished. */
SetEvent(vss_ctx.hEventThaw);
- 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;
+ }
HRESULT hr = WaitForAsync(vss_ctx.pAsyncSnapshot);
switch (hr) {
--
2.50.1
next prev parent reply other threads:[~2025-09-01 11:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-01 11:24 [PULL v2 0/9] Misc QGA fixes for 2025-08-29 Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 1/9] qga: Fix ubsan warning Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 2/9] qga: fix potentially not initialized nr_volumes in qga_vss_fsfreeze() Kostiantyn Kostiuk
2025-09-01 11:24 ` Kostiantyn Kostiuk [this message]
2025-09-01 11:24 ` [PULL v2 4/9] qga-vss: Remove unused dependencies Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 5/9] qga: Fix channel initialization check in run_agent_once Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 6/9] qga: ignore channel_init() fail if 'retry_path' is set Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 7/9] qga-vss: Write hex value of error in log Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 8/9] qga/installer: Remove QGA VSS if QGA installation failed Kostiantyn Kostiuk
2025-09-01 11:24 ` [PULL v2 9/9] qga: Fix truncated output handling in guest-exec status reporting Kostiantyn Kostiuk
2025-09-02 13:47 ` [PULL v2 0/9] Misc QGA fixes for 2025-08-29 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250901112413.114314-4-kkostiuk@redhat.com \
--to=kkostiuk@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).