[Qemu-commits] [qemu/qemu] ad1c7e: linux-user: Correct DLINFO_ITEMS

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: ad1c7e0faac82eeb654cba7f99d4e6d88273e0f9
      
https://github.com/qemu/qemu/commit/ad1c7e0faac82eeb654cba7f99d4e6d88273e0f9
  Author: James Hogan <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M linux-user/elfload.c

  Log Message:
  -----------
  linux-user: Correct DLINFO_ITEMS

Commit a07c67dfccb1 (Implement AT_CLKTCK.) back in March 2008 added a
new auxvec entry but didn't increment DLINFO_ITEMS, so it's been out of
sync ever since.

Bump it up to 14 so that it matches the number of NEW_AUX_ENT's that
need to be counted in create_elf_tables().

Signed-off-by: James Hogan <address@hidden>
Cc: Riku Voipio <address@hidden>
Cc: Paul Brook <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>


  Commit: b0f49d138777fb6609aa2ea96d2c59fb872d2c2d
      
https://github.com/qemu/qemu/commit/b0f49d138777fb6609aa2ea96d2c59fb872d2c2d
  Author: Prasad Joshi <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/scsi/vmw_pvscsi.c

  Log Message:
  -----------
  scsi: check req pointer before dereferencing it

Signed-off-by: Prasad Joshi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: ec8929a55512606456e364ffa80586219f67c904
      
https://github.com/qemu/qemu/commit/ec8929a55512606456e364ffa80586219f67c904
  Author: Prasad Joshi <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/scsi/spapr_vscsi.c

  Log Message:
  -----------
  spapr_vscsi: remove duplicate condition check

Signed-off-by: Prasad Joshi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 61898bc020c3367c629a99a2abdaa1c60fce76cd
      
https://github.com/qemu/qemu/commit/61898bc020c3367c629a99a2abdaa1c60fce76cd
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M hw/scsi/spapr_vscsi.c
    M hw/scsi/vmw_pvscsi.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging

* remotes/bonzini/scsi-next:
  spapr_vscsi: remove duplicate condition check
  scsi: check req pointer before dereferencing it

Signed-off-by: Peter Maydell <address@hidden>


  Commit: db237e33c08a279f0179f8f5128a6d10d9adc38a
      
https://github.com/qemu/qemu/commit/db237e33c08a279f0179f8f5128a6d10d9adc38a
  Author: Peter Maydell <address@hidden>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M linux-user/elfload.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/riku/for-2.0' into staging

* remotes/riku/for-2.0:
  linux-user: Correct DLINFO_ITEMS

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0a87466ef3fe...db237e33c08a