[Qemu-devel] [PULL for-2.0 0/2] qemu-ga w32 build fixes

[Qemu-devel] [PULL for-2.0 0/2] qemu-ga w32 build fixes

[Michael Roth]

Hi Peter,

Please pull the following 2 patches, which fix a w32 build regression for
qemu-ga that was introduced during 2.0 development cycle.

The following changes since commit 55519a4b244e4822774b593e36647ecf7598286b:

  Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging (2014-04-07 17:57:23 +0100)

are available in the git repository at:


  git://github.com/mdroth/qemu.git qga-pull-2014-4-7

for you to fetch changes up to 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5:

  vss-win32: Fix build with mingw64-headers-3.1.0 (2014-04-07 14:39:19 -0500)

----------------------------------------------------------------
Tomoki Sekiyama (2):
      Makefile: add qga-vss-dll-obj-y to nested variables
      vss-win32: Fix build with mingw64-headers-3.1.0

 Makefile                  |    1 +
 qga/vss-win32/install.cpp |    3 +++
 2 files changed, 4 insertions(+)

[Qemu-devel] [PATCH for-2.0 1/2] Makefile: add qga-vss-dll-obj-y to nested variables

[Michael Roth]

From: Tomoki Sekiyama <tomoki.sekiyama@hds.com>

The build rule for qga/vss-win32/qga-vss.dll is broken by commit
ba1183da9a10b94611cad88c44a5c6df005f9b55, because it misses
qga-vss-dll-obj-y in the list of nested variables.
This fixes build of qga-vss.dll by adding qga-vss-dll-obj-y to the list.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 Makefile |    1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index d622799..423e373 100644
--- a/Makefile
+++ b/Makefile
@@ -133,6 +133,7 @@ dummy := $(call unnest-vars,, \
                 stub-obj-y \
                 util-obj-y \
                 qga-obj-y \
+                qga-vss-dll-obj-y \
                 block-obj-y \
                 block-obj-m \
                 common-obj-y \
-- 
1.7.9.5

[Qemu-devel] [PATCH for-2.0 2/2] vss-win32: Fix build with mingw64-headers-3.1.0

[Michael Roth]

From: Tomoki Sekiyama <tomoki.sekiyama@hds.com>

In mingw64-headers-3.1.0, definition of _com_issue_error() is added, which
conflicts with definition in install.cpp. This adds version checking for
mingw headers to disable the definition when the headers>=3.1 is used.

Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 qga/vss-win32/install.cpp |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/qga/vss-win32/install.cpp b/qga/vss-win32/install.cpp
index b791a6c..b0e4426 100644
--- a/qga/vss-win32/install.cpp
+++ b/qga/vss-win32/install.cpp
@@ -75,10 +75,13 @@ static void errmsg_dialog(DWORD err, const char *text, const char *opt = "")
 
 #define chk(status) _chk(hr, status, "Failed to " #status, out)
 
+#if !defined(__MINGW64_VERSION_MAJOR) || !defined(__MINGW64_VERSION_MINOR) || \
+    __MINGW64_VERSION_MAJOR * 100 + __MINGW64_VERSION_MINOR < 301
 void __stdcall _com_issue_error(HRESULT hr)
 {
     errmsg(hr, "Unexpected error in COM");
 }
+#endif
 
 template<class T>
 HRESULT put_Value(ICatalogObject *pObj, LPCWSTR name, T val)
-- 
1.7.9.5

Re: [Qemu-devel] [PULL for-2.0 0/2] qemu-ga w32 build fixes

[Peter Maydell]

On 7 April 2014 21:21, Michael Roth <mdroth@linux.vnet.ibm.com> wrote:
> Hi Peter,
>
> Please pull the following 2 patches, which fix a w32 build regression for
> qemu-ga that was introduced during 2.0 development cycle.
>
> The following changes since commit 55519a4b244e4822774b593e36647ecf7598286b:
>
>   Merge remote-tracking branch 'remotes/afaerber/tags/qom-devices-for-2.0' into staging (2014-04-07 17:57:23 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/mdroth/qemu.git qga-pull-2014-4-7
>
> for you to fetch changes up to 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5:
>
>   vss-win32: Fix build with mingw64-headers-3.1.0 (2014-04-07 14:39:19 -0500)
>
> ----------------------------------------------------------------
> Tomoki Sekiyama (2):
>       Makefile: add qga-vss-dll-obj-y to nested variables
>       vss-win32: Fix build with mingw64-headers-3.1.0

Applied, thanks.

-- PMM