qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 44699e: s390x: Fix the confusing contribution

From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 44699e: s390x: Fix the confusing contributions-after-2012 ...
Date: Mon, 18 Feb 2019 06:09:19 -0800 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 44699e1c94bad41bbeb0c96f9ed344eb8e325413
      
https://github.com/qemu/qemu/commit/44699e1c94bad41bbeb0c96f9ed344eb8e325413
  Author: Thomas Huth <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M linux-user/s390x/target_cpu.h
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x: Fix the confusing contributions-after-2012 license statements

The license information in these files is rather confusing. The text
declares LGPL first, but then says that contributions after 2012 are
licensed under the GPL instead. How should the average user who just
downloaded the release tarball know which part is now GPL and which
is LGPL?

Looking at the text of the LGPL (see COPYING.LIB in the top directory),
the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
 License instead of this License to a given copy of the Library. To do
 this, you must alter all the notices that refer to this License, so
 that they refer to the ordinary GNU General Public License, version 2,
 instead of to this License."

Thus let's clean up the confusing statements and use the proper GPL
text only.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Acked-by: Laurent Vivier <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 09ced81aac76e1adfa0d4b9868f7dc4b38e66f19
      
https://github.com/qemu/qemu/commit/09ced81aac76e1adfa0d4b9868f7dc4b38e66f19
  Author: Cornelia Huck <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M hw/s390x/Makefile.objs
    R hw/s390x/s390-pci-stub.c
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/cpu_models.c
    M target/s390x/gen-features.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x: always provide pci support

We tried to make pci support optional on s390x in the past;
unfortunately, we still require the s390 phb to be created
unconditionally due to backwards compatibility issues.

Instead of sinking more effort into this (including compat
handling for older machines etc.) for non-obvious gains, let's
just make CONFIG_PCI something that is always set on s390x.

Note that you can still fence off pci for the _guest_ if you
provide a cpu model without the zpci feature.

Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4037c39ba5d0507fa9e1ee302013b4b35e2526f5
      
https://github.com/qemu/qemu/commit/4037c39ba5d0507fa9e1ee302013b4b35e2526f5
  Author: Richard Henderson <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M include/hw/s390x/tod.h
    A target/s390x/s390-tod.h

  Log Message:
  -----------
  target/s390x: Split out s390-tod.h

We will need these from CONFIG_USER_ONLY as well,
which cannot access include/hw/.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 965018bea7ce79e1987b50ba9160cba957f015df
      
https://github.com/qemu/qemu/commit/965018bea7ce79e1987b50ba9160cba957f015df
  Author: Richard Henderson <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M target/s390x/helper.h
    M target/s390x/insn-data.def
    M target/s390x/misc_helper.c
    M target/s390x/translate.c

  Log Message:
  -----------
  target/s390x: Implement STCK et al for CONFIG_USER_ONLY

This is a non-privileged instruction that was only implemented
for system mode.  However, the stck instruction is used by glibc,
so this was causing SIGILL for programs run under debian stretch.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Richard Henderson <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: d646b16b21eca8d586dcbbd15bb47ed0387546c6
      
https://github.com/qemu/qemu/commit/d646b16b21eca8d586dcbbd15bb47ed0387546c6
  Author: David Hildenbrand <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x: add zPCI feature to "qemu" CPU model

As we now always have PCI support, let's add it to the "qemu" CPU model,
taking care of backwards compatibility.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ddf5d18af3ce3029d5b93222af5a9e8160d4c34b
      
https://github.com/qemu/qemu/commit/ddf5d18af3ce3029d5b93222af5a9e8160d4c34b
  Author: Collin Walling <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M target/s390x/cpu_features.c
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  s390x/cpumodel: mepochptff: warn when no mepoch and re-align group init

The extended PTFF features (qsie, qtoue, stoe, stoue) are dependent
on the multiple-epoch facility (mepoch). Let's print a warning if these
features are enabled without mepoch.

While we're at it, let's move the FEAT_GROUP_INIT for mepochptff down
the s390_feature_groups list so it can be properly indexed with its
generated S390FeatGroup enum.

Signed-off-by: Collin Walling <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 84176c7906ffaf59457bd7dff25a3ea32e00c3d8
      
https://github.com/qemu/qemu/commit/84176c7906ffaf59457bd7dff25a3ea32e00c3d8
  Author: Collin Walling <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/cpu_models.c
    M target/s390x/cpu_models.h
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x/cpumodel: default enable mepoch for z14 and later

Latest systems and host kernels support mepoch, which is a
feature that was meant to be supported for z14 GA1 from the
get-go. Let's copy it to the z14 GA1 default CPU model.

Machines s390-ccw-virtio-3.1 and older will retain the old CPU
models and will not provide this bit nor the extended PTFF
functions in the default model.

Signed-off-by: Collin Walling <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: f2a7d1577115bda770d619ff5bc45db1f656edc3
      
https://github.com/qemu/qemu/commit/f2a7d1577115bda770d619ff5bc45db1f656edc3
  Author: Collin Walling <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

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

  Log Message:
  -----------
  s390x/cpumodel: add z14 GA2 model

Introduce the z14 GA2 cpu model for QEMU. There are no new features
introduced with this model, and will inherit the same feature set as
z14 GA1.

Signed-off-by: Collin Walling <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 747c432f1e63dab75e5ea6184d8e844a6d7e67f8
      
https://github.com/qemu/qemu/commit/747c432f1e63dab75e5ea6184d8e844a6d7e67f8
  Author: Cornelia Huck <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M target/s390x/kvm.c
    M target/s390x/trace-events

  Log Message:
  -----------
  s390x/kvm: add tracepoint to ioeventfd interface

Trace when assigning/unassigning.

Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 0922e8c093a564219fcb7f43b18ceb12714dd931
      
https://github.com/qemu/qemu/commit/0922e8c093a564219fcb7f43b18ceb12714dd931
  Author: Cornelia Huck <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  s390x: upgrade status of KVM cores to "supported"

We are actually paid to look after this.

Message-Id: <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Acked-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1c5d9d8f111b9cfc0722c7edcdc3b090736972e5
      
https://github.com/qemu/qemu/commit/1c5d9d8f111b9cfc0722c7edcdc3b090736972e5
  Author: Peter Maydell <address@hidden>
  Date:   2019-02-18 (Mon, 18 Feb 2019)

  Changed paths:
    M MAINTAINERS
    M hw/s390x/Makefile.objs
    R hw/s390x/s390-pci-stub.c
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/tod.h
    M linux-user/s390x/target_cpu.h
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/cpu_features.c
    M target/s390x/cpu_models.c
    M target/s390x/cpu_models.h
    M target/s390x/gen-features.c
    M target/s390x/helper.h
    M target/s390x/insn-data.def
    M target/s390x/kvm.c
    M target/s390x/misc_helper.c
    A target/s390x/s390-tod.h
    M target/s390x/trace-events
    M target/s390x/translate.c

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

s390x updates:
- tcg: implement STCK and friends for CONFIG_USER_ONLY
- add zpci to qemu cpu model, as pci is now always built
- add mepoch to default z14 cpu model
- add cpu model for z14 GA2
- various improvements

# gpg: Signature made Mon 18 Feb 2019 11:06:23 GMT
# 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-20190218:
  s390x: upgrade status of KVM cores to "supported"
  s390x/kvm: add tracepoint to ioeventfd interface
  s390x/cpumodel: add z14 GA2 model
  s390x/cpumodel: default enable mepoch for z14 and later
  s390x/cpumodel: mepochptff: warn when no mepoch and re-align group init
  s390x: add zPCI feature to "qemu" CPU model
  target/s390x: Implement STCK et al for CONFIG_USER_ONLY
  target/s390x: Split out s390-tod.h
  s390x: always provide pci support
  s390x: Fix the confusing contributions-after-2012 license statements

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


Compare: https://github.com/qemu/qemu/compare/1e36232994c8...1c5d9d8f111b
reply via email to
[Prev in Thread] Current Thread [Next in Thread]