diff options
author | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:39:34 +0100 |
---|---|---|
committer | Andreas Färber <afaerber@suse.de> | 2012-12-23 00:40:49 +0100 |
commit | 501a7ce7270955be151c442c27620fa7af2f3ce5 (patch) | |
tree | 0374e4d581a0246074d55712b81baf01f3c439b6 /backends | |
parent | 62e0c095450f6a7eb37914991f3f7966aa4da7a1 (diff) | |
parent | 36f25d2537c40c6c47f4abee5d31a24863d1adf7 (diff) | |
download | qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.zip qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.gz qemu-501a7ce7270955be151c442c27620fa7af2f3ce5.tar.bz2 |
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
Adapt header include paths.
Signed-off-by: Andreas Färber <afaerber@suse.de>
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 ad84737..fd41b53 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 9c9923b..d479ce8 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 06f2611..48a5840 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, |