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>

diff --git a/block/qcow.c b/block/qcow.c
index 13d396b89a5d7f0cb7c1a36c5e6d7dbc1825db1e..3278e552bf220625da77e716f6cc1acd3e867487 100644 (file)
--- 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 7e7d775b37285df8813d10b81ec55ba000373864..1d180732e9a3e952b5fbcf7d10bdc4acffec0d4c 100644 (file)
--- 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 bf8db2abd3577ca6783ea3cf4f364c24afd99fca..94218432f34e3da0ac93c4690e4f295e22098cd2 100644 (file)
--- 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
similarity index 100%
rename from include/block/aes.h
rename to include/qemu/aes.h

diff --git a/util/aes.c b/util/aes.c
index 1da7bff1c96a4ddbf40bf4c5c06b8d92a891e627..54c7b98d395cd9c869fca80cef304d4df5726181 100644 (file)
--- 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