]> git.proxmox.com Git - mirror_qemu.git/commit - qga/vss-win32.c
qga: fix w32 breakage due to missing osdep.h includes
authorMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 25 Feb 2016 00:14:52 +0000 (18:14 -0600)
committerMichael Roth <mdroth@linux.vnet.ibm.com>
Thu, 25 Feb 2016 16:54:32 +0000 (10:54 -0600)
commite55eb806dbb97f53794b0c2f86983d34f6696845
treebc600d543a5e21954572566c47656300824d142d
parent8021de10131868a8857e64b91cf0a868b76a61d8
qga: fix w32 breakage due to missing osdep.h includes

requester.h relied on qemu/compiler.h definitions to
handle GCC_FMT_ATTR() stub, but this include was removed as part
of scripted clean-ups via 30456d5:

  all: Clean up includes

under the assumption that all C files would have included it via
qemu/osdep.h at that point. requester.cpp was likely missed
due to C++ files requiring manual/special handling as well as
VSS build options needing to be enabled to trigger build failures.

Fix this by including qemu/osdep.h. That in turn pulls in a
macro from qapi/error.h that conflicts with a struct field name
in requester.h, so fix that as well by renaming the field.

While we're at it, fix up provider.cpp/install.cpp to include
osdep.h as well.

Cc: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
qga/vss-win32.c
qga/vss-win32/install.cpp
qga/vss-win32/provider.cpp
qga/vss-win32/requester.cpp
qga/vss-win32/requester.h