summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2013-03-31 12:58:30 +0200
committerAurelien Jarno <aurelien@aurel32.net>2013-04-13 13:51:57 +0200
commit753d9b82c5a18182294980f4fc1081d7926aae83 (patch)
tree75204b38efc0f12fe40a05bbf8924f7e046cddeb
parent309b4de122c387e0f75624307fcd9896be7ec8fe (diff)
downloadqemu-753d9b82c5a18182294980f4fc1081d7926aae83.tar.gz
aes: move aes.h from include/block to include/qemu
Move aes.h from include/block to include/qemu to show it can be reused by other subsystems. Cc: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--block/qcow.c2
-rw-r--r--block/qcow2.c2
-rw-r--r--block/qcow2.h2
-rw-r--r--include/qemu/aes.h (renamed from include/block/aes.h)0
-rw-r--r--util/aes.c2
5 files changed, 4 insertions, 4 deletions
diff --git a/block/qcow.c b/block/qcow.c
index 13d396b89a..3278e552bf 100644
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -25,7 +25,7 @@
#include "block/block_int.h"
#include "qemu/module.h"
#include <zlib.h>
-#include "block/aes.h"
+#include "qemu/aes.h"
#include "migration/migration.h"
/**************************************************************/
diff --git a/block/qcow2.c b/block/qcow2.c
index 7e7d775b37..1d180732e9 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -25,7 +25,7 @@
#include "block/block_int.h"
#include "qemu/module.h"
#include <zlib.h>
-#include "block/aes.h"
+#include "qemu/aes.h"
#include "block/qcow2.h"
#include "qemu/error-report.h"
#include "qapi/qmp/qerror.h"
diff --git a/block/qcow2.h b/block/qcow2.h
index bf8db2abd3..94218432f3 100644
--- a/block/qcow2.h
+++ b/block/qcow2.h
@@ -25,7 +25,7 @@
#ifndef BLOCK_QCOW2_H
#define BLOCK_QCOW2_H
-#include "block/aes.h"
+#include "qemu/aes.h"
#include "block/coroutine.h"
//#define DEBUG_ALLOC
diff --git a/include/block/aes.h b/include/qemu/aes.h
index a0167eb7d5..a0167eb7d5 100644
--- a/include/block/aes.h
+++ b/include/qemu/aes.h
diff --git a/util/aes.c b/util/aes.c
index 1da7bff1c9..54c7b98d39 100644
--- a/util/aes.c
+++ b/util/aes.c
@@ -28,7 +28,7 @@
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "qemu-common.h"
-#include "block/aes.h"
+#include "qemu/aes.h"
#ifndef NDEBUG
#define NDEBUG