diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-12-19 17:15:39 -0600 |
| commit | 27dd7730582be85c7d4f680f5f71146629809c86 (patch) | |
| tree | 3a36db2e407711ed222de28b839744db48a75059 /arch_init.c | |
| parent | 914606d26e654d4c01bd5186f4d05e3fd445e219 (diff) | |
| parent | ec5e016c9a68588bd01be387416923c7dcafb951 (diff) | |
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 'arch_init.c')
| -rw-r--r-- | arch_init.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arch_init.c b/arch_init.c index 83dcc53ff5..a8b65416da 100644 --- a/arch_init.c +++ b/arch_init.c @@ -29,23 +29,23 @@ #include <sys/mman.h> #endif #include "config.h" -#include "monitor.h" -#include "sysemu.h" -#include "bitops.h" -#include "bitmap.h" -#include "arch_init.h" +#include "monitor/monitor.h" +#include "sysemu/sysemu.h" +#include "qemu/bitops.h" +#include "qemu/bitmap.h" +#include "sysemu/arch_init.h" #include "audio/audio.h" #include "hw/pc.h" -#include "hw/pci.h" +#include "hw/pci/pci.h" #include "hw/audiodev.h" -#include "kvm.h" -#include "migration.h" -#include "net.h" -#include "gdbstub.h" +#include "sysemu/kvm.h" +#include "migration/migration.h" +#include "exec/gdbstub.h" #include "hw/smbios.h" -#include "exec-memory.h" +#include "exec/address-spaces.h" #include "hw/pcspk.h" -#include "qemu/page_cache.h" +#include "migration/page_cache.h" +#include "qemu/config-file.h" #include "qmp-commands.h" #include "trace.h" |