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 /qemu-sockets.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 'qemu-sockets.c')
-rw-r--r-- | qemu-sockets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qemu-sockets.c b/qemu-sockets.c index c52a40a411..3537bf3d45 100644 --- a/qemu-sockets.c +++ b/qemu-sockets.c @@ -22,10 +22,10 @@ #include <errno.h> #include <unistd.h> -#include "monitor.h" -#include "qemu_socket.h" +#include "monitor/monitor.h" +#include "qemu/sockets.h" #include "qemu-common.h" /* for qemu_isdigit */ -#include "main-loop.h" +#include "qemu/main-loop.h" #ifndef AI_ADDRCONFIG # define AI_ADDRCONFIG 0 |