mbox

[PULL,0/7] Final changes for 2.4-rc0

Message ID 1436278308-12720-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Pull-request

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

Message

Paolo Bonzini July 7, 2015, 2:11 p.m. UTC 
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 1a79902fb054ea9881c8008f77a861ef63f60152:

  crypto: add a nettle cipher implementation (2015-07-07 16:10:27 +0200)

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

----------------------------------------------------------------
Daniel P. Berrange (6):
      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

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

 MAINTAINERS                           |   7 +
 Makefile.objs                         |   1 +
 block/qcow.c                          |   2 +-
 block/qcow2.c                         |   1 -
 block/qcow2.h                         |   2 +-
 configure                             | 103 +++++++++
 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                      |   2 +-
 ui/vnc.c                              |   2 +-
 util/Makefile.objs                    |   2 +-
 vl.c                                  |  18 +-
 34 files changed, 2297 insertions(+), 27 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

Comments

Paolo Bonzini July 7, 2015, 2:27 p.m. UTC | #1 
On 07/07/2015 16:11, Paolo Bonzini 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 1a79902fb054ea9881c8008f77a861ef63f60152:
> 
>   crypto: add a nettle cipher implementation (2015-07-07 16:10:27 +0200)
> 
> ----------------------------------------------------------------
> Bugfixes and Daniel Berrange's crypto library.
> 
> ----------------------------------------------------------------
> Daniel P. Berrange (6):
>       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
> 
> Eric Auger (1):
>       vl: move rom_load_all after machine init done
> 
>  MAINTAINERS                           |   7 +
>  Makefile.objs                         |   1 +
>  block/qcow.c                          |   2 +-
>  block/qcow2.c                         |   1 -
>  block/qcow2.h                         |   2 +-
>  configure                             | 103 +++++++++
>  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                      |   2 +-
>  ui/vnc.c                              |   2 +-
>  util/Makefile.objs                    |   2 +-
>  vl.c                                  |  18 +-
>  34 files changed, 2297 insertions(+), 27 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
> 

Please ignore this pull request.

Paolo
Peter Maydell July 7, 2015, 4:08 p.m. UTC | #2 
On 7 July 2015 at 15:27, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 07/07/2015 16:11, Paolo Bonzini 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 1a79902fb054ea9881c8008f77a861ef63f60152:
>>
>>   crypto: add a nettle cipher implementation (2015-07-07 16:10:27 +0200)
>>
>> ----------------------------------------------------------------
>> Bugfixes and Daniel Berrange's crypto library.
>>
>> ----------------------------------------------------------------
>> Daniel P. Berrange (6):
>>       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
>>
>> Eric Auger (1):
>>       vl: move rom_load_all after machine init done
>>
>>  MAINTAINERS                           |   7 +
>>  Makefile.objs                         |   1 +
>>  block/qcow.c                          |   2 +-
>>  block/qcow2.c                         |   1 -
>>  block/qcow2.h                         |   2 +-
>>  configure                             | 103 +++++++++
>>  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                      |   2 +-
>>  ui/vnc.c                              |   2 +-
>>  util/Makefile.objs                    |   2 +-
>>  vl.c                                  |  18 +-
>>  34 files changed, 2297 insertions(+), 27 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
>>
>
> Please ignore this pull request.

...but the 12-patch v2 pullreq is OK, yes?

thanks
-- PMM
Paolo Bonzini July 7, 2015, 4:10 p.m. UTC | #3 
On 07/07/2015 18:08, Peter Maydell wrote:
>> > Please ignore this pull request.
> ...but the 12-patch v2 pullreq is OK, yes?

Yes, that one is okay.

Paolo