diff options
| author | Juan Quintela <quintela@redhat.com> | 2017-04-17 18:59:13 +0200 |
|---|---|---|
| committer | Juan Quintela <quintela@redhat.com> | 2017-05-18 19:20:59 +0200 |
| commit | 82b9d0f06ab23c0c06b0a8c3adac4c39c38db67a (patch) | |
| tree | 6c9213a0b1649c615f281f4f6c41ed02fe04dbb5 | |
| parent | 576d1abc205fb1c135a7448df96bc9d47cb360dc (diff) | |
migration: Remove qemu-file.h from vmstate.h
Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
--
minor rearangements due to the rebase
| -rw-r--r-- | include/hw/hw.h | 1 | ||||
| -rw-r--r-- | include/migration/vmstate.h | 3 | ||||
| -rw-r--r-- | migration/block.c | 1 | ||||
| -rw-r--r-- | migration/colo.c | 1 | ||||
| -rw-r--r-- | migration/postcopy-ram.c | 1 | ||||
| -rw-r--r-- | migration/ram.c | 1 | ||||
| -rw-r--r-- | tests/test-vmstate.c | 1 |
7 files changed, 6 insertions, 3 deletions
diff --git a/include/hw/hw.h b/include/hw/hw.h index e22d4ce5fa..af9eae11c5 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -11,6 +11,7 @@ #include "exec/memory.h" #include "hw/irq.h" #include "migration/vmstate.h" +#include "migration/qemu-file.h" #include "qemu/module.h" #include "sysemu/reset.h" diff --git a/include/migration/vmstate.h b/include/migration/vmstate.h index dacb052551..f97411d31f 100644 --- a/include/migration/vmstate.h +++ b/include/migration/vmstate.h @@ -27,9 +27,6 @@ #ifndef QEMU_VMSTATE_H #define QEMU_VMSTATE_H -#ifndef CONFIG_USER_ONLY -#include "migration/qemu-file.h" -#endif #include "migration/qjson.h" typedef void SaveStateHandler(QEMUFile *f, void *opaque); diff --git a/migration/block.c b/migration/block.c index 5d229264bf..5baf46d0e3 100644 --- a/migration/block.c +++ b/migration/block.c @@ -26,6 +26,7 @@ #include "migration/block.h" #include "migration/migration.h" #include "sysemu/blockdev.h" +#include "migration/qemu-file.h" #include "sysemu/block-backend.h" #define BLOCK_SIZE (1 << 20) diff --git a/migration/colo.c b/migration/colo.c index 73ebd64cbb..929b31c50c 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -15,6 +15,7 @@ #include "sysemu/sysemu.h" #include "qemu-file-channel.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "migration/colo.h" #include "migration/block.h" #include "io/channel-buffer.h" diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 63b850128e..0e2a996168 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -20,6 +20,7 @@ #include "qemu-common.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "postcopy-ram.h" #include "sysemu/sysemu.h" #include "sysemu/balloon.h" diff --git a/migration/ram.c b/migration/ram.c index c14269fd16..8ce8c07a68 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -37,6 +37,7 @@ #include "qemu/main-loop.h" #include "xbzrle.h" #include "migration/migration.h" +#include "migration/qemu-file.h" #include "postcopy-ram.h" #include "exec/address-spaces.h" #include "migration/page_cache.h" diff --git a/tests/test-vmstate.c b/tests/test-vmstate.c index 1c135708f4..25389bcce4 100644 --- a/tests/test-vmstate.c +++ b/tests/test-vmstate.c @@ -27,6 +27,7 @@ #include "qemu-common.h" #include "migration/migration.h" #include "migration/vmstate.h" +#include "migration/qemu-file.h" #include "../migration/qemu-file-channel.h" #include "qemu/coroutine.h" #include "io/channel-file.h" |