[Qemu-commits] [qemu/qemu] de6bb0: s390x/cpumodel: remove esort from the default model

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: de6bb08570065eb318849dfd7f316448e51197b5
      
https://github.com/qemu/qemu/commit/de6bb08570065eb318849dfd7f316448e51197b5
  Author: Christian Borntraeger <address@hidden>
  Date:   2019-07-16 (Tue, 16 Jul 2019)

  Changed paths:
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x/cpumodel: remove esort from the default model

esort might not be available on all models.

Fixes: caef62430fed6e73 ("s390x/cpumodel: add gen15 defintions")
Signed-off-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 0d4cb295db7503fbac2f5bb3e878a56630231fed
      
https://github.com/qemu/qemu/commit/0d4cb295db7503fbac2f5bb3e878a56630231fed
  Author: Christian Borntraeger <address@hidden>
  Date:   2019-07-16 (Tue, 16 Jul 2019)

  Changed paths:
    M target/s390x/cpu_features_def.inc.h

  Log Message:
  -----------
  s390x/cpumodel: also change name of vxbeh

David suggested to keep everything in sync as 4.1 is not yet released.
This patch fixes the name "vxbeh" into "vxpdeh".

To simplify the backports this patch will not change VECTOR_BCD_ENH as
this is just an internal name. That will be done by an extra patch that
does not need to be backported.

Suggested-by: David Hildenbrand <address@hidden>
Fixes: d05be57ddc2e ("s390: cpumodel: fix description for the new vector 
facility")
Fixes: 54d65de0b525 ("s390x/cpumodel: vector enhancements")
Signed-off-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
[CH: vxp->vxpdeh, as discussed]
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5d8866c89817998a3d9c3055d5dc2b5a8e78658a
      
https://github.com/qemu/qemu/commit/5d8866c89817998a3d9c3055d5dc2b5a8e78658a
  Author: Christian Borntraeger <address@hidden>
  Date:   2019-07-16 (Tue, 16 Jul 2019)

  Changed paths:
    M target/s390x/cpu_features_def.inc.h
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x/cpumodel: change internal name of vxpdeh to match description

The internal macro name VECTOR_BCD_ENH does not match the actual
description. Fix this.

Signed-off-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
[CH: vxp->vxpdeh, as discussed]
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7
      
https://github.com/qemu/qemu/commit/1a1c0995cd4f8fe3bfeaac4e7a42e6125d6e05e7
  Author: Peter Maydell <address@hidden>
  Date:   2019-07-16 (Tue, 16 Jul 2019)

  Changed paths:
    M target/s390x/cpu_features_def.inc.h
    M target/s390x/gen-features.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190716' into staging

straighten out some things in the gen15 cpu model

# gpg: Signature made Tue 16 Jul 2019 14:50:34 BST
# gpg:                using RSA key C3D0D66DC3624FF6A8C018CEDECF6B93C6F02FAF
# gpg:                issuer "address@hidden"
# gpg: Good signature from "Cornelia Huck <address@hidden>" [unknown]
# gpg:                 aka "Cornelia Huck <address@hidden>" [full]
# gpg:                 aka "Cornelia Huck <address@hidden>" [full]
# gpg:                 aka "Cornelia Huck <address@hidden>" [unknown]
# gpg:                 aka "Cornelia Huck <address@hidden>" [unknown]
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20190716:
  s390x/cpumodel: change internal name of vxpdeh to match description
  s390x/cpumodel: also change name of vxbeh
  s390x/cpumodel: remove esort from the default model

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


Compare: https://github.com/qemu/qemu/compare/697f59243f5a...1a1c0995cd4f