[Qemu-commits] [qemu/qemu] e73316: s390x/kvm: disable cpu model for the 2.7 machine

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e73316d594256cedb926cb76444e8ee00a5032b9
      
https://github.com/qemu/qemu/commit/e73316d594256cedb926cb76444e8ee00a5032b9
  Author: Christian Borntraeger <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M hw/s390x/s390-virtio-ccw.c
    M include/hw/s390x/s390-virtio-ccw.h
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: disable cpu model for the 2.7 machine

cpu model was merged with 2.8, it is wrong to abuse ri_allowed which
was enabled with 2.7.

Signed-off-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1e4738b2d4141e8045036ff7e03bed4f185649ff
      
https://github.com/qemu/qemu/commit/1e4738b2d4141e8045036ff7e03bed4f185649ff
  Author: Sascha Silbe <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update s390 machine file patterns

Some files used by s390 KVM code were missing in MAINTAINERS. Add
them.

Reported-by: Markus Armbruster <address@hidden>
Signed-off-by: Sascha Silbe <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: e32652f7594e6c027737fa495974cb73754cb5d0
      
https://github.com/qemu/qemu/commit/e32652f7594e6c027737fa495974cb73754cb5d0
  Author: Pierre Morel <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h

  Log Message:
  -----------
  virtio-ccw: respond to READ_STATUS command

This patch adds the response to the READ_STATUS CCW command.

Signed-off-by: Pierre Morel <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7aa2adc28335f4ac47f7e86e043fb8557eb3cbc3
      
https://github.com/qemu/qemu/commit/7aa2adc28335f4ac47f7e86e043fb8557eb3cbc3
  Author: Pierre Morel <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M hw/s390x/virtio-ccw.h

  Log Message:
  -----------
  virtio-ccw: set revision 2 as maximal revision number

We have everything needed for virtio-ccw revision 2 wired up now.
Bump the maximum supported revision reported on a device basis to
the guest so they can make use of it.

Signed-off-by: Pierre Morel <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4d4ccabdd22153bd19e0c4bbb6fbfe8402a7b845
      
https://github.com/qemu/qemu/commit/4d4ccabdd22153bd19e0c4bbb6fbfe8402a7b845
  Author: Christian Borntraeger <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  QMP: fixup typos and whitespace damage

Fixup some typos and whitespace damage introduced by the CPU model
patches for s390.

Reported-by: Eric Blake <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 6e98670feb717e0315c6a396cde8417ffa68cac7
      
https://github.com/qemu/qemu/commit/6e98670feb717e0315c6a396cde8417ffa68cac7
  Author: Peter Maydell <address@hidden>
  Date:   2016-09-19 (Mon, 19 Sep 2016)

  Changed paths:
    M MAINTAINERS
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/virtio-ccw.c
    M hw/s390x/virtio-ccw.h
    M include/hw/s390x/s390-virtio-ccw.h
    M qapi-schema.json
    M target-s390x/kvm.c

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

Couple of s390x patches:
- fixup for the cpu model patches
- support for virtio 1.1 READ_STATUS command
- update MAINTAINERS file pattern

# gpg: Signature made Mon 19 Sep 2016 10:11:06 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20160919:
  QMP: fixup typos and whitespace damage
  virtio-ccw: set revision 2 as maximal revision number
  virtio-ccw: respond to READ_STATUS command
  MAINTAINERS: update s390 machine file patterns
  s390x/kvm: disable cpu model for the 2.7 machine

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


Compare: https://github.com/qemu/qemu/compare/0f2fa73ba0ca...6e98670feb71