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/qapi/qmp-event.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'qemu/qapi/qmp-event.c') diff --git a/qemu/qapi/qmp-event.c b/qemu/qapi/qmp-event.c index 0d1ce0bd1..8bba165bf 100644 --- a/qemu/qapi/qmp-event.c +++ b/qemu/qapi/qmp-event.c @@ -11,21 +11,13 @@ * */ -#include +#include "qemu/osdep.h" #include "qemu-common.h" #include "qapi/qmp-event.h" #include "qapi/qmp/qstring.h" #include "qapi/qmp/qjson.h" -#ifdef _WIN32 -#include "sysemu/os-win32.h" -#endif - -#ifdef CONFIG_POSIX -#include "sysemu/os-posix.h" -#endif - static QMPEventFuncEmit qmp_emit; void qmp_event_set_func_emit(QMPEventFuncEmit emit) -- cgit 1.2.3-korg