111 lines
3.5 KiB
Diff
111 lines
3.5 KiB
Diff
From a7d32227e6a7b3eff114135f68f980ac686f6b80 Mon Sep 17 00:00:00 2001
|
|
From: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
Date: Sun, 30 Jul 2023 23:14:18 -0700
|
|
Subject: [PATCH] QGA VSS: Add wrapper to send log to debugger and stderr
|
|
mainline inclusion commit 925d05d38a2bc76b5a49359370650a820bc891da category:
|
|
bugfix
|
|
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
|
|
---
|
|
qga/vss-win32/meson.build | 2 +-
|
|
qga/vss-win32/vss-debug.cpp | 39 +++++++++++++++++++++++++++++++++++++
|
|
qga/vss-win32/vss-debug.h | 25 ++++++++++++++++++++++++
|
|
3 files changed, 65 insertions(+), 1 deletion(-)
|
|
create mode 100644 qga/vss-win32/vss-debug.cpp
|
|
create mode 100644 qga/vss-win32/vss-debug.h
|
|
|
|
diff --git a/qga/vss-win32/meson.build b/qga/vss-win32/meson.build
|
|
index 90825edef3..290796556c 100644
|
|
--- a/qga/vss-win32/meson.build
|
|
+++ b/qga/vss-win32/meson.build
|
|
@@ -3,7 +3,7 @@ if add_languages('cpp', required: false)
|
|
link_args = cc.get_supported_link_arguments(['-fstack-protector-all', '-fstack-protector-strong',
|
|
'-Wl,--add-stdcall-alias', '-Wl,--enable-stdcall-fixup'])
|
|
|
|
- qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp'],
|
|
+ qga_vss = shared_module('qga-vss', ['requester.cpp', 'provider.cpp', 'install.cpp', 'vss-debug.cpp'],
|
|
name_prefix: '',
|
|
cpp_args: ['-Wno-unknown-pragmas', '-Wno-delete-non-virtual-dtor', '-Wno-non-virtual-dtor'],
|
|
link_args: link_args,
|
|
diff --git a/qga/vss-win32/vss-debug.cpp b/qga/vss-win32/vss-debug.cpp
|
|
new file mode 100644
|
|
index 0000000000..820b1c6667
|
|
--- /dev/null
|
|
+++ b/qga/vss-win32/vss-debug.cpp
|
|
@@ -0,0 +1,39 @@
|
|
+/*
|
|
+ * QEMU Guest Agent VSS debug declarations
|
|
+ *
|
|
+ * Copyright (C) 2023 Red Hat Inc
|
|
+ *
|
|
+ * Authors:
|
|
+ * Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
+ *
|
|
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
+ * See the COPYING file in the top-level directory.
|
|
+ */
|
|
+
|
|
+#include "qemu/osdep.h"
|
|
+#include "vss-debug.h"
|
|
+#include "vss-common.h"
|
|
+
|
|
+void qga_debug_internal(const char *funcname, const char *fmt, ...)
|
|
+{
|
|
+ char user_string[512] = {0};
|
|
+ char full_string[640] = {0};
|
|
+
|
|
+ va_list args;
|
|
+ va_start(args, fmt);
|
|
+ if (vsnprintf(user_string, _countof(user_string), fmt, args) <= 0) {
|
|
+ va_end(args);
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ va_end(args);
|
|
+
|
|
+ if (snprintf(full_string, _countof(full_string),
|
|
+ QGA_PROVIDER_NAME "[%lu]: %s %s\n",
|
|
+ GetCurrentThreadId(), funcname, user_string) <= 0) {
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ OutputDebugString(full_string);
|
|
+ fputs(full_string, stderr);
|
|
+}
|
|
diff --git a/qga/vss-win32/vss-debug.h b/qga/vss-win32/vss-debug.h
|
|
new file mode 100644
|
|
index 0000000000..7800457392
|
|
--- /dev/null
|
|
+++ b/qga/vss-win32/vss-debug.h
|
|
@@ -0,0 +1,25 @@
|
|
+/*
|
|
+ * QEMU Guest Agent VSS debug declarations
|
|
+ *
|
|
+ * Copyright (C) 2023 Red Hat Inc
|
|
+ *
|
|
+ * Authors:
|
|
+ * Konstantin Kostiuk <kkostiuk@redhat.com>
|
|
+ *
|
|
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
+ * See the COPYING file in the top-level directory.
|
|
+ */
|
|
+
|
|
+#include "qemu/osdep.h"
|
|
+#include <vss-handles.h>
|
|
+
|
|
+#ifndef VSS_DEBUG_H
|
|
+#define VSS_DEBUG_H
|
|
+
|
|
+void qga_debug_internal(const char *funcname, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
|
|
+
|
|
+#define qga_debug(fmt, ...) qga_debug_internal(__func__, fmt, ## __VA_ARGS__)
|
|
+#define qga_debug_begin qga_debug("begin")
|
|
+#define qga_debug_end qga_debug("end")
|
|
+
|
|
+#endif
|
|
--
|
|
2.41.0.windows.1
|
|
|