[Qemu-commits] [qemu/qemu] 761956: pc-bios/s390-ccw: build for z900

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 7619562a643a472fab8ad6a173a37e046a2fc671
      
https://github.com/qemu/qemu/commit/7619562a643a472fab8ad6a173a37e046a2fc671
  Author: Christian Borntraeger <address@hidden>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M pc-bios/s390-ccw/Makefile

  Log Message:
  -----------
  pc-bios/s390-ccw: build for z900

Newer distributions have an architecture level set to z9, z196
or similar - also as default option for the compiler.

We should build the bios for z900 to allow it to run with
all 64bit CPUs. This will become more important as soon as
QEMU/KVM does support CPU models.

Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-By: Sascha Silbe <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 07af4c53a5cafba31853d2c9188b0668ae9f53b7
      
https://github.com/qemu/qemu/commit/07af4c53a5cafba31853d2c9188b0668ae9f53b7
  Author: Cornelia Huck <address@hidden>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

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

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

Contains:
- pc-bios/s390-ccw: build for z900

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


  Commit: 567c88c354904d669dfac6170b8ac5f60b41d9bd
      
https://github.com/qemu/qemu/commit/567c88c354904d669dfac6170b8ac5f60b41d9bd
  Author: Cornelia Huck <address@hidden>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

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

  Log Message:
  -----------
  s390x: no deprecation warning while testing

'make check' tries to start all available machines; the deprecation
message for the s390-virtio machine is both useless and annoying
there. Silence it while testing.

Reported-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>


  Commit: f0a399dbae6a2d0e2e15eb7ce0783286bbd9fe04
      
https://github.com/qemu/qemu/commit/f0a399dbae6a2d0e2e15eb7ce0783286bbd9fe04
  Author: Yi Min Zhao <address@hidden>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

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

  Log Message:
  -----------
  s390x/pci: fix up IOMMU size

Present code uses @size==UINT64_MAX to initialize IOMMU. It infers that it
can map any 64-bit IOVA whatsoever. But in fact, the largest DMA range for
each PCI Device on s390x is from ZPCI_SDMA_ADDR to ZPCI_EDMA_ADDR. The largest
value is returned from hardware, which is to indicate the largest range
hardware can support. But the real IOMMU size for specific PCI Device is
obtained once qemu intercepts mpcifc instruction that guest is requesting a
DMA range for that PCI Device. Therefore, before intercepting mpcifc 
instruction,
qemu cannot be aware of the size of IOMMU region that guest will use.

Moreover, iommu replay during device initialization for the whole region in
4k steps takes a very long time.

In conclusion, this patch intializes IOMMU region for each PCI Device when
intercept mpcifc instruction which is to register DMA range for the PCI Device.
And then, destroy IOMMU region when guest wants to deregister IOAT.

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


  Commit: e3d58827fe4efa8d40a78359350a185e238514e0
      
https://github.com/qemu/qemu/commit/e3d58827fe4efa8d40a78359350a185e238514e0
  Author: Peter Maydell <address@hidden>
  Date:   2015-12-01 (Tue, 01 Dec 2015)

  Changed paths:
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c
    M hw/s390x/s390-virtio.c
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/Makefile

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

Last round of s390x fixes for 2.5:
- The bios should be built for the first z machine, so that newer
  instructions don't creep in.
- Silence annoying message when running make check.
- Fix a problem with the pci iommu exposed by recent changes.

# gpg: Signature made Tue 01 Dec 2015 08:59:42 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20151201:
  s390x/pci: fix up IOMMU size
  s390x: no deprecation warning while testing
  pc-bios/s390-ccw: rebuild image
  pc-bios/s390-ccw: build for z900

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


Compare: https://github.com/qemu/qemu/compare/d90eb4590241...e3d58827fe4e