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 /ui/spice-core.c | |
| parent | 914606d26e654d4c01bd5186f4d05e3fd445e219 (diff) | |
| parent | ec5e016c9a68588bd01be387416923c7dcafb951 (diff) | |
| download | qemu-27dd7730582be85c7d4f680f5f71146629809c86.tar.gz | |
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 'ui/spice-core.c')
| -rw-r--r-- | ui/spice-core.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ui/spice-core.c b/ui/spice-core.c index ac46deb2be..3e44779107 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -19,25 +19,25 @@ #include <spice-experimental.h> #include <netdb.h> -#include "sysemu.h" +#include "sysemu/sysemu.h" #include "qemu-common.h" -#include "qemu-spice.h" -#include "qemu-thread.h" -#include "qemu-timer.h" -#include "qemu-queue.h" +#include "ui/qemu-spice.h" +#include "qemu/thread.h" +#include "qemu/timer.h" +#include "qemu/queue.h" #include "qemu-x509.h" -#include "qemu_socket.h" +#include "qemu/sockets.h" #include "qmp-commands.h" -#include "qint.h" -#include "qbool.h" -#include "qstring.h" -#include "qjson.h" -#include "notify.h" -#include "migration.h" -#include "monitor.h" +#include "qapi/qmp/qint.h" +#include "qapi/qmp/qbool.h" +#include "qapi/qmp/qstring.h" +#include "qapi/qmp/qjson.h" +#include "qemu/notify.h" +#include "migration/migration.h" +#include "monitor/monitor.h" #include "hw/hw.h" -#include "spice-display.h" +#include "ui/spice-display.h" /* core bits */ |