[Qemu-commits] [qemu/qemu] 450749: s390x: remove duplicate defines in SCLP code

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 450749141ef90841f8731fc41e28c364bf768759
      
https://github.com/qemu/qemu/commit/450749141ef90841f8731fc41e28c364bf768759
  Author: Jens Freimann <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M include/hw/s390x/sclp.h

  Log Message:
  -----------
  s390x: remove duplicate defines in SCLP code

Let's get rid of these duplicate defines.

Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: a327c9215d8a9b5935ea807aaa9b65ccd23ec615
      
https://github.com/qemu/qemu/commit/a327c9215d8a9b5935ea807aaa9b65ccd23ec615
  Author: Cornelia Huck <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/css.h
    M target-s390x/ioinst.h

  Log Message:
  -----------
  s390x/css: support format-0 ccws

Add support for format-0 ccws in channel programs. As a format-1 ccw
contains the same information as format-0 ccws, only supporting larger
addresses, simply convert every ccw to format-1 as we walk the chain.

Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: e8601dd5d0ffa909068ddefe33bf6a53d8af063a
      
https://github.com/qemu/qemu/commit/e8601dd5d0ffa909068ddefe33bf6a53d8af063a
  Author: Cornelia Huck <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/css.h

  Log Message:
  -----------
  s390x/css: catch ccw sequence errors

We must not allow chains of more than 255 ccws without data transfer.

Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: cad684c5386ea01cd725418ff678d54af74068c3
      
https://github.com/qemu/qemu/commit/cad684c5386ea01cd725418ff678d54af74068c3
  Author: Peter Maydell <address@hidden>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/css.h
    M include/hw/s390x/sclp.h
    M target-s390x/ioinst.h

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20140923' into 
staging

s390x/kvm: some fixes and cleanups

1. sclp: get of of duplicate defines
2. ccw: implement and fix handling of some special cases

# gpg: Signature made Tue 23 Sep 2014 13:10:47 BST using RSA key ID B5A61C7C
# gpg: Can't check signature: public key not found

* remotes/borntraeger/tags/s390x-20140923:
  s390x/css: catch ccw sequence errors
  s390x/css: support format-0 ccws
  s390x: remove duplicate defines in SCLP code

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


Compare: https://github.com/qemu/qemu/compare/380f649e02f9...cad684c5386e