[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 24/30] qga/vss: use standard windows headers location
From: |
Paolo Bonzini |
Subject: |
[PULL 24/30] qga/vss: use standard windows headers location |
Date: |
Tue, 15 Feb 2022 10:32:17 +0100 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Stop using special paths with outdated headers from an old SDK.
Instead, use standard include paths.
You can still build against the old SDK by running configure with
--extra-cxxflags="-isystem /path/to/inc/win2003/"
(this also allows to build against MinGW headers, which are currently
broken as in 9.0)
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
qga/vss-win32/install.cpp | 2 +-
qga/vss-win32/provider.cpp | 4 ++--
qga/vss-win32/requester.cpp | 4 ++--
qga/vss-win32/vss-common.h | 6 +-----
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index 40de133774..efc5bb9909 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -13,7 +13,7 @@
#include "qemu/osdep.h"
#include "vss-common.h"
-#include <inc/win2003/vscoordint.h>
+#include <vscoordint.h>
#include "install.h"
#include <wbemidl.h>
#include <comdef.h>
diff --git a/qga/vss-win32/provider.cpp b/qga/vss-win32/provider.cpp
index 72d8b0e19d..fd187fb66f 100644
--- a/qga/vss-win32/provider.cpp
+++ b/qga/vss-win32/provider.cpp
@@ -12,8 +12,8 @@
#include "qemu/osdep.h"
#include "vss-common.h"
-#include <inc/win2003/vscoordint.h>
-#include <inc/win2003/vsprov.h>
+#include <vscoordint.h>
+#include <vsprov.h>
#define VSS_TIMEOUT_MSEC (60*1000)
diff --git a/qga/vss-win32/requester.cpp b/qga/vss-win32/requester.cpp
index 940a2c8f55..4513324dd2 100644
--- a/qga/vss-win32/requester.cpp
+++ b/qga/vss-win32/requester.cpp
@@ -14,8 +14,8 @@
#include "vss-common.h"
#include "requester.h"
#include "install.h"
-#include <inc/win2003/vswriter.h>
-#include <inc/win2003/vsbackup.h>
+#include <vswriter.h>
+#include <vsbackup.h>
/* Max wait time for frozen event (VSS can only hold writes for 10 seconds) */
#define VSS_TIMEOUT_FREEZE_MSEC 60000
diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h
index 61c170b52e..54f8de8c88 100644
--- a/qga/vss-win32/vss-common.h
+++ b/qga/vss-win32/vss-common.h
@@ -46,11 +46,7 @@
#undef VSS_E_MAXIMUM_NUMBER_OF_VOLUMES_REACHED
#undef VSS_E_MAXIMUM_NUMBER_OF_SNAPSHOTS_REACHED
-/*
- * VSS headers must be installed from Microsoft VSS SDK 7.2 available at:
- * http://www.microsoft.com/en-us/download/details.aspx?id=23490
- */
-#include <inc/win2003/vss.h>
+#include <vss.h>
#include "vss-handles.h"
/* Macros to convert char definitions to wchar */
--
2.34.1
- [PULL 21/30] qga/vss-win32: fix midl arguments, (continued)
- [PULL 21/30] qga/vss-win32: fix midl arguments, Paolo Bonzini, 2022/02/15
- [PULL 20/30] configure, meson: move OpenGL check to meson, Paolo Bonzini, 2022/02/15
- [PULL 17/30] configure, meson: move smbd options to meson_options.txt, Paolo Bonzini, 2022/02/15
- [PULL 18/30] configure, meson: move guest-agent, tools to meson, Paolo Bonzini, 2022/02/15
- [PULL 22/30] meson: drop --with-win-sdk, Paolo Bonzini, 2022/02/15
- [PULL 25/30] configure, meson: replace VSS SDK checks and options with --enable-vss-sdk, Paolo Bonzini, 2022/02/15
- [PULL 28/30] meson: require dynamic linking for VSS support, Paolo Bonzini, 2022/02/15
- [PULL 27/30] qga/vss-win32: require widl/midl, remove pre-built TLB file, Paolo Bonzini, 2022/02/15
- [PULL 19/30] meson: refine check for whether to look for virglrenderer, Paolo Bonzini, 2022/02/15
- [PULL 23/30] qga/vss-win32: use widl if available, Paolo Bonzini, 2022/02/15
- [PULL 24/30] qga/vss: use standard windows headers location,
Paolo Bonzini <=
- [PULL 26/30] meson: do not make qga/vss-win32/meson.build conditional on C++ presence, Paolo Bonzini, 2022/02/15
- [PULL 30/30] configure, meson: move CONFIG_IASL to a Meson option, Paolo Bonzini, 2022/02/15
- [PULL 29/30] meson, configure: move ntddscsi API check to meson, Paolo Bonzini, 2022/02/15
- Re: [PULL 00/30] Misc mostly build system patches for 2022-02-15, Peter Maydell, 2022/02/16