e55eb806db
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>
46 lines
1.1 KiB
C
46 lines
1.1 KiB
C
/*
|
|
* QEMU Guest Agent VSS requester declarations
|
|
*
|
|
* Copyright Hitachi Data Systems Corp. 2013
|
|
*
|
|
* Authors:
|
|
* Tomoki Sekiyama <tomoki.sekiyama@hds.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.
|
|
*/
|
|
|
|
#ifndef VSS_WIN32_REQUESTER_H
|
|
#define VSS_WIN32_REQUESTER_H
|
|
|
|
#include <basetyps.h> /* STDAPI */
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct Error;
|
|
|
|
/* Callback to set Error; used to avoid linking glib to the DLL */
|
|
typedef void (*ErrorSetFunc)(struct Error **errp,
|
|
const char *src, int line, const char *func,
|
|
int win32_err, const char *fmt, ...)
|
|
GCC_FMT_ATTR(6, 7);
|
|
typedef struct ErrorSet {
|
|
ErrorSetFunc error_setg_win32_wrapper;
|
|
struct Error **errp; /* restriction: must not be null */
|
|
} ErrorSet;
|
|
|
|
STDAPI requester_init(void);
|
|
STDAPI requester_deinit(void);
|
|
|
|
typedef void (*QGAVSSRequesterFunc)(int *, ErrorSet *);
|
|
void requester_freeze(int *num_vols, ErrorSet *errset);
|
|
void requester_thaw(int *num_vols, ErrorSet *errset);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif
|