[Qemu-commits] [qemu/qemu] b49848: s390x/css: sense data endianness

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b498484ed49ab9d1fcada3468f95dda1a5f59366
      
https://github.com/qemu/qemu/commit/b498484ed49ab9d1fcada3468f95dda1a5f59366
  Author: Cornelia Huck <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: sense data endianness

We keep the device's sense data in a byte array (following the
architecture), but the ecws are an array of 32 bit values. If we
just blindly copy the values, the sense data will change from
de-facto BE data to de-facto cpu-endian data, which means we end
up doing an incorrect conversion on LE hosts.

Let's just explicitly convert to cpu-endianness while assembling
the irb.

Reported-by: Andy Lutomirski <address@hidden>
Tested-by: Andy Lutomirski <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>


  Commit: dce1b089249f52c053cf74dc3da98aea16656961
      
https://github.com/qemu/qemu/commit/dce1b089249f52c053cf74dc3da98aea16656961
  Author: Yi Min Zhao <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/s390x/s390-pci-bus.c

  Log Message:
  -----------
  s390x/pci : fix up s390 pci iommu translation function

On s390x, each pci device has its own iommu, which is only properly
setup in qemu once the mpcifc instruction used to register the
translation table has been intercepted. Therefore, for a pci device that
is not configured or has not been initialized, proper translation is
neither required nor possible. Moreover, we may not have a host bridge
device ready yet.

This was exposed by a recent vfio change that triggers iommu translation
during the initialization of the vfio pci device. Let's do an early exit
in that case.

Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Jens Freimann <address@hidden>
Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c5bfb202bb3bcdc1a368e85fef336e89d6254f8c
      
https://github.com/qemu/qemu/commit/c5bfb202bb3bcdc1a368e85fef336e89d6254f8c
  Author: Cornelia Huck <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M MAINTAINERS

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

We were missing some files, and some files should get an additional
entry to add the people actually looking after the code.

Reported-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 3e9ed24b84c4acdd077904a74eaec6d95cfef928
      
https://github.com/qemu/qemu/commit/3e9ed24b84c4acdd077904a74eaec6d95cfef928
  Author: Cornelia Huck <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M MAINTAINERS

  Log Message:
  -----------
  MAINTAINERS: update virtio-ccw/s390 git tree

Let's reference the git branch I actually use, and add Christian's
git tree.

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


  Commit: ae23a33591056d6349753766047ebc511158da9c
      
https://github.com/qemu/qemu/commit/ae23a33591056d6349753766047ebc511158da9c
  Author: Dominik Dingel <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

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

  Log Message:
  -----------
  s390x: switch to memory_region_allocate_system_memory

By replacing memory_region_init_ram with memory_region_allocate_system_memory
we gain goodies like mem-path backends. This will allow us to use hugetlbfs
once the kernel supports it.

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


  Commit: 4c292a009700755a1e6b234063ef3f2db235aaae
      
https://github.com/qemu/qemu/commit/4c292a009700755a1e6b234063ef3f2db235aaae
  Author: Dominik Dingel <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: don't enable CMMA when hugetlbfs will be used

On hugetlbfs CMMA will not be useful as every ESSA instruction will trap.
So don't offer CMMA to guests with a hugepages backing.

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


  Commit: 38150be860434de9d9c76cef71ff5c6b6112ee8f
      
https://github.com/qemu/qemu/commit/38150be860434de9d9c76cef71ff5c6b6112ee8f
  Author: Maxim Samoylov <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/s390-ccw/virtio.h

  Log Message:
  -----------
  pc-bios/s390-ccw: Always adjust virtio sector count

Let's always adjust the sector number to be read using the current
virtio block size value.

This prepares for the implementation of IPL from ISO-9660 media.

Signed-off-by: Maxim Samoylov <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 866cac91e06219f473a2900eefef0d1cf242b136
      
https://github.com/qemu/qemu/commit/866cac91e06219f473a2900eefef0d1cf242b136
  Author: Maxim Samoylov <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/bootmap.h
    M pc-bios/s390-ccw/virtio.c
    M pc-bios/s390-ccw/virtio.h

  Log Message:
  -----------
  pc-bios/s390-ccw: ISO-9660 El Torito boot implementation

This patch enables boot from media formatted according to
ISO-9660 and El Torito bootable CD specification.

We try to boot from device as ISO-9660 media when SCSI IPL failed.

The first boot catalog entry with bootable flag is used.

ISO-9660 media with default 2048-bytes sector size only is supported.

Signed-off-by: Maxim Samoylov <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ba21f0cca8165c5b284274edd12dc955cf4fb248
      
https://github.com/qemu/qemu/commit/ba21f0cca8165c5b284274edd12dc955cf4fb248
  Author: Maxim Samoylov <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/bootmap.h

  Log Message:
  -----------
  pc-bios/s390-ccw: El Torito s390x boot entry check

Boot entry is considered compatible if boot image is Linux kernel
with matching S390 Linux magic string.

Empty boot images with sector_count == 0 are considered broken.

Signed-off-by: Maxim Samoylov <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 869648e87eeb998cc0ede230f3b7aabfdf0eb2dd
      
https://github.com/qemu/qemu/commit/869648e87eeb998cc0ede230f3b7aabfdf0eb2dd
  Author: Maxim Samoylov <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/bootmap.h

  Log Message:
  -----------
  pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround

Because of El Torito spec flaw boot image size needs to be verified.

Boot catalog entry size field has 16-bit width, and specifies size
in 512-byte units.

Thus, boot image size cannot exceed 32M.

We actually search for the file to get the file size.

This is done by scanning the ISO directory tree for the ISO block number
and reading the file size from the directory entry.

Signed-off-by: Maxim Samoylov <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 81a93ee64d78a1933998ff1b95f06b6d67db46fd
      
https://github.com/qemu/qemu/commit/81a93ee64d78a1933998ff1b95f06b6d67db46fd
  Author: Cornelia Huck <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M pc-bios/s390-ccw.img

  Log Message:
  -----------
  pc-bios/s390-ccw: rebuild image

Contains:
  pc-bios/s390-ccw: Always adjust virtio sector count
  pc-bios/s390-ccw: ISO-9660 El Torito boot implementation
  pc-bios/s390-ccw: El Torito s390x boot entry check
  pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround

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


  Commit: ff8de0757fc13407c81f002e936031ddc13057e4
      
https://github.com/qemu/qemu/commit/ff8de0757fc13407c81f002e936031ddc13057e4
  Author: David Hildenbrand <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/core/qdev.c
    M include/hw/qdev-core.h

  Log Message:
  -----------
  qdev: provide qdev_reset_all_fn()

For TYPE_DEVICE, the dc->reset() function is not called on system resets
yet. Until that is changed, we have to manually register a reset handler.
Let's provide qdev_reset_all_fn(), that can directly be used - just like
the reset handler that is already available for qbus.

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


  Commit: 04fccf106e22c4b861398cf2146f5a5b5f18d01e
      
https://github.com/qemu/qemu/commit/04fccf106e22c4b861398cf2146f5a5b5f18d01e
  Author: David Hildenbrand <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

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

  Log Message:
  -----------
  s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE

Let's move the qom definitions of the ipl device into ipl.h, replace
"s390-ipl" by a proper type define, turn it into a TYPE_DEVICE
and remove the unneeded class definition.

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


  Commit: 8f04e88e2cd792e348eb54983ce1a485d5db4f27
      
https://github.com/qemu/qemu/commit/8f04e88e2cd792e348eb54983ce1a485d5db4f27
  Author: David Hildenbrand <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/s390x/ipl.c

  Log Message:
  -----------
  s390x/ipl: switch error reporting to error_setg

Now that we can report errors in the realize function, let's replace
the fprintf's and hw_error's with error_setg.

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


  Commit: 3c4c694c7ce2d21c0cf17a27cc60c91b6725ce48
      
https://github.com/qemu/qemu/commit/3c4c694c7ce2d21c0cf17a27cc60c91b6725ce48
  Author: Christian Borntraeger <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M hw/s390x/s390-virtio.c

  Log Message:
  -----------
  s390: deprecate the non-ccw machine in 2.5

The non-ccw machine for s390 (s390-virtio) is not very well maintained
and caused several issues in the past:
- aliases like virtio-blk did not work for s390
- virtio refactoring failed due to long standing bugs (e.g.see
commit cb927b8a "s390-virtio: Accommodate guests using virtqueues too early")
- some features like memory hotplug will cause trouble due to virtio storage
  being above guest memory
- the boot loader bios no longer seems to work. the source code of that
  loader is also no longer maintained

2.4 changed the default to the ccw machine, let's deprecate the old
machine for 2.5.

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


  Commit: 31e49ac192f782d594bbd04070fe79e800b7813f
      
https://github.com/qemu/qemu/commit/31e49ac192f782d594bbd04070fe79e800b7813f
  Author: Peter Maydell <address@hidden>
  Date:   2015-11-11 (Wed, 11 Nov 2015)

  Changed paths:
    M MAINTAINERS
    M hw/core/qdev.c
    M hw/s390x/css.c
    M hw/s390x/ipl.c
    M hw/s390x/ipl.h
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/s390-virtio.c
    M include/hw/qdev-core.h
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/bootmap.h
    M pc-bios/s390-ccw/virtio.c
    M pc-bios/s390-ccw/virtio.h
    M target-s390x/kvm.c

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

Hopefully last big batch of s390x patches, including:
- bugfixes for LE host and for pci translation
- MAINTAINERS update
- hugetlbfs enablement (kernel patches pending)
- boot from El Torito iso images on virtio-blk
  (boot from scsi pending)
- cleanup in the ipl device code

There's also a helper function for resetting busless devices in the
qdev core in there.

# gpg: Signature made Wed 11 Nov 2015 17:49:58 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20151111:
  s390: deprecate the non-ccw machine in 2.5
  s390x/ipl: switch error reporting to error_setg
  s390x/ipl: clean up qom definitions and turn into TYPE_DEVICE
  qdev: provide qdev_reset_all_fn()
  pc-bios/s390-ccw: rebuild image
  pc-bios/s390-ccw: El Torito 16-bit boot image size field workaround
  pc-bios/s390-ccw: El Torito s390x boot entry check
  pc-bios/s390-ccw: ISO-9660 El Torito boot implementation
  pc-bios/s390-ccw: Always adjust virtio sector count
  s390x/kvm: don't enable CMMA when hugetlbfs will be used
  s390x: switch to memory_region_allocate_system_memory
  MAINTAINERS: update virtio-ccw/s390 git tree
  MAINTAINERS: update s390 file patterns
  s390x/pci : fix up s390 pci iommu translation function
  s390x/css: sense data endianness

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


Compare: https://github.com/qemu/qemu/compare/2869653f23c6...31e49ac192f7