[PULL,v2,00/12] Final changes for 2.4-rc0

The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:

  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into staging (2015-07-06 23:37:53 +0100)

are available in the git repository at:

  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to c2cf14b2d2fa7b7b5e84cc8953a804ceab89a559:

  ossaudio: fix memory leak (2015-07-07 16:12:06 +0200)

----------------------------------------------------------------
Bugfixes and Daniel Berrange's crypto library.

----------------------------------------------------------------
Daniel P. Berrange (10):
      crypto: introduce new module for computing hash digests
      crypto: move built-in AES implementation into crypto/
      crypto: move built-in D3DES implementation into crypto/
      crypto: introduce generic cipher API & built-in implementation
      crypto: add a gcrypt cipher implementation
      crypto: add a nettle cipher implementation
      block: convert quorum blockdrv to use crypto APIs
      ui: convert VNC websockets to use crypto APIs
      block: convert qcow/qcow2 to use generic cipher API
      ui: convert VNC to use generic cipher API

Eric Auger (1):
      vl: move rom_load_all after machine init done

Gonglei (1):
      ossaudio: fix memory leak

 MAINTAINERS                           |   7 +
 Makefile.objs                         |   1 +
 audio/ossaudio.c                      |   1 +
 block/Makefile.objs                   |   2 +-
 block/qcow.c                          | 102 ++++++---
 block/qcow2-cluster.c                 |  46 +++-
 block/qcow2.c                         |  96 ++++----
 block/qcow2.h                         |  13 +-
 block/quorum.c                        |  41 ++--
 configure                             | 160 +++++++++-----
 crypto/Makefile.objs                  |   5 +
 {util => crypto}/aes.c                |   2 +-
 crypto/cipher-builtin.c               | 398 ++++++++++++++++++++++++++++++++++
 crypto/cipher-gcrypt.c                | 195 +++++++++++++++++
 crypto/cipher-nettle.c                | 206 ++++++++++++++++++
 crypto/cipher.c                       |  75 +++++++
 ui/d3des.c => crypto/desrfb.c         |   2 +-
 crypto/hash.c                         | 200 +++++++++++++++++
 crypto/init.c                         | 150 +++++++++++++
 hw/core/loader.c                      |   8 +-
 include/{qemu => crypto}/aes.h        |   0
 include/crypto/cipher.h               | 210 ++++++++++++++++++
 ui/d3des.h => include/crypto/desrfb.h |   0
 include/crypto/hash.h                 | 189 ++++++++++++++++
 include/crypto/init.h                 |  29 +++
 include/hw/loader.h                   |   3 +-
 target-arm/crypto_helper.c            |   2 +-
 target-i386/fpu_helper.c              |   1 -
 target-i386/ops_sse.h                 |   2 +-
 target-ppc/int_helper.c               |   2 +-
 tests/.gitignore                      |   2 +
 tests/Makefile                        |   4 +
 tests/test-crypto-cipher.c            | 290 +++++++++++++++++++++++++
 tests/test-crypto-hash.c              | 209 ++++++++++++++++++
 ui/Makefile.objs                      |   4 +-
 ui/vnc-ws.c                           |  22 +-
 ui/vnc-ws.h                           |   2 -
 ui/vnc.c                              | 119 +++++-----
 ui/vnc.h                              |   8 -
 util/Makefile.objs                    |   2 +-
 vl.c                                  |  18 +-
 41 files changed, 2549 insertions(+), 279 deletions(-)
 create mode 100644 crypto/Makefile.objs
 rename {util => crypto}/aes.c (99%)
 create mode 100644 crypto/cipher-builtin.c
 create mode 100644 crypto/cipher-gcrypt.c
 create mode 100644 crypto/cipher-nettle.c
 create mode 100644 crypto/cipher.c
 rename ui/d3des.c => crypto/desrfb.c (99%)
 create mode 100644 crypto/hash.c
 create mode 100644 crypto/init.c
 rename include/{qemu => crypto}/aes.h (100%)
 create mode 100644 include/crypto/cipher.h
 rename ui/d3des.h => include/crypto/desrfb.h (100%)
 create mode 100644 include/crypto/hash.h
 create mode 100644 include/crypto/init.h
 create mode 100644 tests/test-crypto-cipher.c
 create mode 100644 tests/test-crypto-hash.c

On 7 July 2015 at 15:12, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit f6e3035f75e5c6a73485335765ae070304c7a110:
>
>   Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-smm' into staging (2015-07-06 23:37:53 +0100)
>
> are available in the git repository at:
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to c2cf14b2d2fa7b7b5e84cc8953a804ceab89a559:
>
>   ossaudio: fix memory leak (2015-07-07 16:12:06 +0200)
>
> ----------------------------------------------------------------
> Bugfixes and Daniel Berrange's crypto library.
>
> ----------------------------------------------------------------

I'm afraid this fails to build on OSX:

/Users/pm215/src/qemu/crypto/cipher.c:36:13: warning: comparison of
unsigned enum expression < 0 is always
      false [-Wtautological-compare]
    if (alg < 0 ||
        ~~~ ^ ~
  CC    block/qcow2-refcount.o
1 warning generated.
  CC    block/qcow2-cluster.o
  CC    block/qcow2-snapshot.o
  CC    block/qcow2-cache.o
  CC    block/quorum.o
  CC    vl.o
In file included from /Users/pm215/src/qemu/block/quorum.c:27:
/sw/include/glib-2.0/glib/gi18n.h:25:10: fatal error: 'libintl.h' file not found
#include <libintl.h>
         ^
1 error generated.

and also on 32-bit ARM Linux:

/root/qemu/crypto/cipher.c: In function ‘qcrypto_cipher_validate_key_length’:
/root/qemu/crypto/cipher.c:36:5: error: comparison of unsigned
expression < 0 is always false [-Werror=type-limits]

-- PMM