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/hw/ipack | |
| 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/hw/ipack')
| -rw-r--r-- | qemu/hw/ipack/ipack.c | 2 | ||||
| -rw-r--r-- | qemu/hw/ipack/tpci200.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/qemu/hw/ipack/ipack.c b/qemu/hw/ipack/ipack.c index 59bfe2869..5f99ed9a7 100644 --- a/qemu/hw/ipack/ipack.c +++ b/qemu/hw/ipack/ipack.c @@ -8,6 +8,8 @@ * later version. */ +#include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/ipack/ipack.h" IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot) diff --git a/qemu/hw/ipack/tpci200.c b/qemu/hw/ipack/tpci200.c index 1df02ee85..fdda6f414 100644 --- a/qemu/hw/ipack/tpci200.c +++ b/qemu/hw/ipack/tpci200.c @@ -8,10 +8,10 @@ * later version. */ +#include "qemu/osdep.h" #include "hw/ipack/ipack.h" #include "hw/pci/pci.h" #include "qemu/bitops.h" -#include <stdio.h> /* #define DEBUG_TPCI */ |