[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 7/9] migration: Remove qemu-file.h from vmstate.h
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 7/9] migration: Remove qemu-file.h from vmstate.h |
Date: |
Wed, 17 May 2017 17:47:54 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
--
minor rearangements due to the rebase
Signed-off-by: Juan Quintela <address@hidden>
---
include/hw/hw.h | 1 +
include/migration/vmstate.h | 3 ---
migration/block.c | 1 +
migration/colo.c | 1 +
migration/postcopy-ram.c | 1 +
migration/ram.c | 1 +
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 e22d4ce..af9eae1 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 dacb052..f97411d 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 5d22926..5baf46d 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 73ebd64..929b31c 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 a0489f6..64f09e1 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 2564c00..04667de 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 1c13570..25389bc 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"
--
2.9.3
- [Qemu-devel] [PATCH 1/9] migration: Create migration/xbzrle.h, (continued)
- [Qemu-devel] [PATCH 1/9] migration: Create migration/xbzrle.h, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 2/9] migration: Split migration/channel.c for channel operations, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 3/9] migration: Export qemu-file-channel.c functions in its own file, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 4/9] migration: Remove migration.h from colo.h, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 5/9] migration: Move qjson.h to migration/, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 7/9] migration: Remove qemu-file.h from vmstate.h,
Juan Quintela <=
- [Qemu-devel] [PATCH 6/9] migration: Split vmstate-types.c from vmstate.c, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 8/9] migration: Remove vmstate.h from migration.h, Juan Quintela, 2017/05/17
- [Qemu-devel] [PATCH 9/9] migration: migration.h was not needed, Juan Quintela, 2017/05/17