OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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>
This commit is contained in:
Michael Roth 2016-02-24 18:14:52 -06:00
parent 8021de1013
commit e55eb806db
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qga/vss-win32.c
View File

@ -150,7 +150,7 @@ void qga_vss_fsfreeze(int *nr_volume, Error **errp, bool freeze)
const char *func_name = freeze ? "requester_freeze" : "requester_thaw";
QGAVSSRequesterFunc func;
ErrorSet errset = {
.error_setg_win32 = error_setg_win32_internal,
.error_setg_win32_wrapper = error_setg_win32_internal,
.errp = errp,
};

3
qga/vss-win32/install.cpp
View File

@ -10,8 +10,7 @@
* See the COPYING file in the top-level directory.
*/
#include <stdio.h>
#include <string.h>
#include "qemu/osdep.h"
#include "vss-common.h"
#include "inc/win2003/vscoordint.h"

2
qga/vss-win32/provider.cpp
View File

@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
#include <stdio.h>
#include "qemu/osdep.h"
#include "vss-common.h"
#include "inc/win2003/vscoordint.h"
#include "inc/win2003/vsprov.h"

8
qga/vss-win32/requester.cpp
View File

@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
#include <stdio.h>
#include "qemu/osdep.h"
#include "vss-common.h"
#include "requester.h"
#include "assert.h"
@ -23,9 +23,9 @@
/* Call QueryStatus every 10 ms while waiting for frozen event */
#define VSS_TIMEOUT_EVENT_MSEC 10
#define err_set(e, err, fmt, ...) \
((e)->error_setg_win32((e)->errp, __FILE__, __LINE__, __func__, \
err, fmt, ## __VA_ARGS__))
#define err_set(e, err, fmt, ...) \
((e)->error_setg_win32_wrapper((e)->errp, __FILE__, __LINE__, __func__, \
err, fmt, ## __VA_ARGS__))
/* Bad idea, works only when (e)->errp != NULL: */
#define err_is_set(e) ((e)->errp && *(e)->errp)
/* To lift this restriction, error_propagate(), like we do in QEMU code */

2
qga/vss-win32/requester.h
View File

@ -27,7 +27,7 @@ typedef void (*ErrorSetFunc)(struct Error **errp,
int win32_err, const char *fmt, ...)
GCC_FMT_ATTR(6, 7);
typedef struct ErrorSet {
ErrorSetFunc error_setg_win32;
ErrorSetFunc error_setg_win32_wrapper;
struct Error **errp; /* restriction: must not be null */
} ErrorSet;