| Message ID | 1434646944-24040-3-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 2015/6/19 1:02, Daniel P. Berrange wrote: > To prepare for a generic internal cipher API, move the > built-in AES implementation into the crypto/ directory > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > block/qcow.c | 2 +- > block/qcow2.c | 1 - > block/qcow2.h | 2 +- > crypto/Makefile.objs | 1 + > {util => crypto}/aes.c | 2 +- > include/{qemu => crypto}/aes.h | 0 > target-arm/crypto_helper.c | 2 +- > target-i386/fpu_helper.c | 1 - > target-i386/ops_sse.h | 2 +- > target-ppc/int_helper.c | 2 +- > util/Makefile.objs | 2 +- > 11 files changed, 8 insertions(+), 9 deletions(-) > rename {util => crypto}/aes.c (99%) > rename include/{qemu => crypto}/aes.h (100%) Reviewed-by: Gonglei <arei.gonglei@huawei.com>
diff --git a/block/qcow.c b/block/qcow.c index 911e59f..5a7c6cb 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 "qemu/aes.h" +#include "crypto/aes.h" #include "migration/migration.h" /**************************************************************/ diff --git a/block/qcow2.c b/block/qcow2.c index c4f6938..e9e3fa5 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -25,7 +25,6 @@ #include "block/block_int.h" #include "qemu/module.h" #include <zlib.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 5936d29..462147c 100644 --- a/block/qcow2.h +++ b/block/qcow2.h @@ -25,7 +25,7 @@ #ifndef BLOCK_QCOW2_H #define BLOCK_QCOW2_H -#include "qemu/aes.h" +#include "crypto/aes.h" #include "block/coroutine.h" //#define DEBUG_ALLOC diff --git a/crypto/Makefile.objs b/crypto/Makefile.objs index 03cc1b2..9efc9b4 100644 --- a/crypto/Makefile.objs +++ b/crypto/Makefile.objs @@ -1,2 +1,3 @@ util-obj-y += init.o util-obj-y += hash.o +util-obj-y += aes.o diff --git a/util/aes.c b/crypto/aes.c similarity index 99% rename from util/aes.c rename to crypto/aes.c index 3d7c4be..244a388 100644 --- a/util/aes.c +++ b/crypto/aes.c @@ -28,7 +28,7 @@ * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "qemu-common.h" -#include "qemu/aes.h" +#include "crypto/aes.h" typedef uint32_t u32; typedef uint8_t u8; diff --git a/include/qemu/aes.h b/include/crypto/aes.h similarity index 100% rename from include/qemu/aes.h rename to include/crypto/aes.h diff --git a/target-arm/crypto_helper.c b/target-arm/crypto_helper.c index 1fe975d..5d22838 100644 --- a/target-arm/crypto_helper.c +++ b/target-arm/crypto_helper.c @@ -14,7 +14,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" -#include "qemu/aes.h" +#include "crypto/aes.h" union CRYPTO_STATE { uint8_t bytes[16]; diff --git a/target-i386/fpu_helper.c b/target-i386/fpu_helper.c index 30d34d5..280adba 100644 --- a/target-i386/fpu_helper.c +++ b/target-i386/fpu_helper.c @@ -20,7 +20,6 @@ #include <math.h> #include "cpu.h" #include "exec/helper-proto.h" -#include "qemu/aes.h" #include "qemu/host-utils.h" #include "exec/cpu_ldst.h" diff --git a/target-i386/ops_sse.h b/target-i386/ops_sse.h index 0765073..bee134b 100644 --- a/target-i386/ops_sse.h +++ b/target-i386/ops_sse.h @@ -18,7 +18,7 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "qemu/aes.h" +#include "crypto/aes.h" #if SHIFT == 0 #define Reg MMXReg diff --git a/target-ppc/int_helper.c b/target-ppc/int_helper.c index 4c2b71c..0a55d5e 100644 --- a/target-ppc/int_helper.c +++ b/target-ppc/int_helper.c @@ -19,7 +19,7 @@ #include "cpu.h" #include "qemu/host-utils.h" #include "exec/helper-proto.h" -#include "qemu/aes.h" +#include "crypto/aes.h" #include "helper_regs.h" /*****************************************************************************/ diff --git a/util/Makefile.objs b/util/Makefile.objs index ceaba30..114d657 100644 --- a/util/Makefile.objs +++ b/util/Makefile.objs @@ -9,7 +9,7 @@ util-obj-y += acl.o util-obj-y += error.o qemu-error.o util-obj-$(CONFIG_POSIX) += compatfd.o util-obj-y += id.o -util-obj-y += iov.o aes.o qemu-config.o qemu-sockets.o uri.o notify.o +util-obj-y += iov.o qemu-config.o qemu-sockets.o uri.o notify.o util-obj-y += qemu-option.o qemu-progress.o util-obj-y += hexdump.o util-obj-y += crc32c.o
To prepare for a generic internal cipher API, move the built-in AES implementation into the crypto/ directory Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- block/qcow.c | 2 +- block/qcow2.c | 1 - block/qcow2.h | 2 +- crypto/Makefile.objs | 1 + {util => crypto}/aes.c | 2 +- include/{qemu => crypto}/aes.h | 0 target-arm/crypto_helper.c | 2 +- target-i386/fpu_helper.c | 1 - target-i386/ops_sse.h | 2 +- target-ppc/int_helper.c | 2 +- util/Makefile.objs | 2 +- 11 files changed, 8 insertions(+), 9 deletions(-) rename {util => crypto}/aes.c (99%) rename include/{qemu => crypto}/aes.h (100%)