diff options
| author |   José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-05-18 13:18:31 +0300 |
|---|---|---|
| committer | José Pekkarinen <jose.pekkarinen@nokia.com> | 2016-05-18 13:42:15 +0300 |
| commit | 437fd90c0250dee670290f9b714253671a990160 (patch) | |
| tree | b871786c360704244a07411c69fb58da9ead4a06 /qemu/disas/m68k.c | |
| parent | 5bbd6fe9b8bab2a93e548c5a53b032d1939eec05 (diff) | |
These changes are the raw update to qemu-2.6.
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 <jose.pekkarinen@nokia.com>
Diffstat (limited to 'qemu/disas/m68k.c')
| -rw-r--r-- | qemu/disas/m68k.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/qemu/disas/m68k.c b/qemu/disas/m68k.c index cc0db96ca..8f74ae115 100644 --- a/qemu/disas/m68k.c +++ b/qemu/disas/m68k.c @@ -1,9 +1,8 @@ /* This file is composed of several different files from the upstream sourceware.org CVS. Original file boundaries marked with **** */ -#include <string.h> +#include "qemu/osdep.h" #include <math.h> -#include <stdio.h> #include "disas/bfd.h" @@ -616,8 +615,6 @@ static const char *const reg_half_names[] = /* Maximum length of an instruction. */ #define MAXLEN 22 -#include <setjmp.h> - struct private { /* Points to first byte not fetched. */ |