diff options
| author | Anthony Liguori | 2012-12-20 00:15:39 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2012-12-20 00:15:39 +0100 |
| commit | 27dd7730582be85c7d4f680f5f71146629809c86 (patch) | |
| tree | 3a36db2e407711ed222de28b839744db48a75059 /block-migration.c | |
| parent | Merge remote-tracking branch 'stefanha/trivial-patches' into staging (diff) | |
| parent | janitor: move remaining public headers to include/ (diff) | |
| download | qemu-27dd7730582be85c7d4f680f5f71146629809c86.tar.gz qemu-27dd7730582be85c7d4f680f5f71146629809c86.tar.xz qemu-27dd7730582be85c7d4f680f5f71146629809c86.zip | |
Merge remote-tracking branch 'bonzini/header-dirs' into staging
* bonzini/header-dirs: (45 commits)
janitor: move remaining public headers to include/
hw: move executable format header files to hw/
fpu: move public header file to include/fpu
softmmu: move remaining include files to include/ subdirectories
softmmu: move include files to include/sysemu/
misc: move include files to include/qemu/
qom: move include files to include/qom/
migration: move include files to include/migration/
monitor: move include files to include/monitor/
exec: move include files to include/exec/
block: move include files to include/block/
qapi: move include files to include/qobject/
janitor: add guards to headers
qapi: make struct Visitor opaque
qapi: remove qapi/qapi-types-core.h
qapi: move inclusions of qemu-common.h from headers to .c files
ui: move files to ui/ and include/ui/
qemu-ga: move qemu-ga files to qga/
net: reorganize headers
net: move net.c to net/
...
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'block-migration.c')
| -rw-r--r-- | block-migration.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/block-migration.c b/block-migration.c index 71b9601e00..ca4ba3fffb 100644 --- a/block-migration.c +++ b/block-migration.c @@ -14,13 +14,13 @@ */ #include "qemu-common.h" -#include "block_int.h" +#include "block/block_int.h" #include "hw/hw.h" -#include "qemu-queue.h" -#include "qemu-timer.h" -#include "block-migration.h" -#include "migration.h" -#include "blockdev.h" +#include "qemu/queue.h" +#include "qemu/timer.h" +#include "migration/block.h" +#include "migration/migration.h" +#include "sysemu/blockdev.h" #include <assert.h> #define BLOCK_SIZE (BDRV_SECTORS_PER_DIRTY_CHUNK << BDRV_SECTOR_BITS) |