From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- qemu/qga/vss-win32/requester.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'qemu/qga/vss-win32/requester.h') diff --git a/qemu/qga/vss-win32/requester.h b/qemu/qga/vss-win32/requester.h index 374f9b8d1..2a39d734a 100644 --- a/qemu/qga/vss-win32/requester.h +++ b/qemu/qga/vss-win32/requester.h @@ -14,19 +14,21 @@ #define VSS_WIN32_REQUESTER_H #include /* STDAPI */ -#include "qemu/compiler.h" #ifdef __cplusplus extern "C" { #endif +struct Error; + /* Callback to set Error; used to avoid linking glib to the DLL */ -typedef void (*ErrorSetFunc)(void **errp, int win32_err, int err_class, - const char *fmt, ...) GCC_FMT_ATTR(4, 5); +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_set; - void **errp; - int err_class; + ErrorSetFunc error_setg_win32_wrapper; + struct Error **errp; /* restriction: must not be null */ } ErrorSet; STDAPI requester_init(void); -- cgit 1.2.3-korg