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 /backends | |
| 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 'backends')
| -rw-r--r-- | backends/rng-egd.c | 4 | ||||
| -rw-r--r-- | backends/rng-random.c | 4 | ||||
| -rw-r--r-- | backends/rng.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/backends/rng-egd.c b/backends/rng-egd.c index ad8473777c..fd41b53188 100644 --- a/backends/rng-egd.c +++ b/backends/rng-egd.c @@ -11,8 +11,8 @@ */ #include "qemu/rng.h" -#include "qemu-char.h" -#include "qerror.h" +#include "char/char.h" +#include "qapi/qmp/qerror.h" #include "hw/qdev.h" /* just for DEFINE_PROP_CHR */ #define TYPE_RNG_EGD "rng-egd" diff --git a/backends/rng-random.c b/backends/rng-random.c index 9c9923b2ac..d479ce8c56 100644 --- a/backends/rng-random.c +++ b/backends/rng-random.c @@ -12,8 +12,8 @@ #include "qemu/rng-random.h" #include "qemu/rng.h" -#include "qerror.h" -#include "main-loop.h" +#include "qapi/qmp/qerror.h" +#include "qemu/main-loop.h" struct RndRandom { diff --git a/backends/rng.c b/backends/rng.c index 06f261180c..48a5840cd5 100644 --- a/backends/rng.c +++ b/backends/rng.c @@ -11,7 +11,7 @@ */ #include "qemu/rng.h" -#include "qerror.h" +#include "qapi/qmp/qerror.h" void rng_backend_request_entropy(RngBackend *s, size_t size, EntropyReceiveFunc *receive_entropy, |