[Qemu-commits] [qemu/qemu] fb85b3: s390x/ccw: fix oddity in machine class init

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: fb85b34da77cba6e255830e7a49447d3c7ef74f0
      
https://github.com/qemu/qemu/commit/fb85b34da77cba6e255830e7a49447d3c7ef74f0
  Author: Cornelia Huck <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

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

  Log Message:
  -----------
  s390x/ccw: fix oddity in machine class init

ccw_machine_class_init() uses ',' instead of ';' while initializing
the class' fields. This is almost certainly a copy/paste error and,
while legal C, rather on the unusual side. Just use ';' everywhere.

Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 6781fc412ef1349740813cbaabe0e86dad39a9be
      
https://github.com/qemu/qemu/commit/6781fc412ef1349740813cbaabe0e86dad39a9be
  Author: Thomas Huth <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M target-s390x/cpu.h

  Log Message:
  -----------
  s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers

The css functions are only used from ioinst.c and other files that are
only built for CONFIG_SOFTMMU. So we do not need the dummy wrappers for
the CONFIG_USER_ONLY target in the cpu.h header.

Signed-off-by: Thomas Huth <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Reviewed-by: Jason J. Herne <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: fdb78ec00655e59c8d47eec91918a4da0d966685
      
https://github.com/qemu/qemu/commit/fdb78ec00655e59c8d47eec91918a4da0d966685
  Author: David Hildenbrand <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: sync register support helper function

Let's unify the code to sync registers by moving the checks into a helper
function can_sync_regs().

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


  Commit: 59ac15326ed8c936459c8163cf264e9fd35a18ba
      
https://github.com/qemu/qemu/commit/59ac15326ed8c936459c8163cf264e9fd35a18ba
  Author: David Hildenbrand <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: avoid syscalls by syncing registers with kvm_run

We can avoid loads of syscalls when dropping to user space by storing the values
of more registers directly within kvm_run.

Support is added for:
- ARCH0: CPU timer, clock comparator, TOD programmable register,
   guest breaking-event register, program parameter
- PFAULT: pfault parameters (token, select, compare)

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


  Commit: 8cba80c3a0331926c9c412c4c1e07896de29aab6
      
https://github.com/qemu/qemu/commit/8cba80c3a0331926c9c412c4c1e07896de29aab6
  Author: Frank Blaschka <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M MAINTAINERS
    M default-configs/s390x-softmmu.mak
    M hw/s390x/Makefile.objs
    M hw/s390x/css.c
    M hw/s390x/css.h
    A hw/s390x/s390-pci-bus.c
    A hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/sclp.c
    M include/hw/s390x/sclp.h
    M target-s390x/ioinst.c
    M target-s390x/ioinst.h

  Log Message:
  -----------
  s390: Add PCI bus support

This patch implements a pci bus for s390x together with infrastructure
to generate and handle hotplug events, to configure/unconfigure via
sclp instruction, to do iommu translations and provide s390 support for
MSI/MSI-X notification processing.

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


  Commit: 863f6f52b7134304234ea81554f62f54afb016fa
      
https://github.com/qemu/qemu/commit/863f6f52b7134304234ea81554f62f54afb016fa
  Author: Frank Blaschka <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M hw/s390x/Makefile.objs
    A hw/s390x/s390-pci-inst.c
    A hw/s390x/s390-pci-inst.h
    M target-s390x/kvm.c

  Log Message:
  -----------
  s390: implement pci instructions

This patch implements the s390 pci instructions in qemu. It allows
to access and drive pci devices attached to the s390 pci bus.
Because of platform constrains devices using IO BARs are not
supported. Also a device has to support MSI/MSI-X to run on s390.

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


  Commit: 9e03a0405d56b4af8952b794d0e5dd9206ee7329
      
https://github.com/qemu/qemu/commit/9e03a0405d56b4af8952b794d0e5dd9206ee7329
  Author: Frank Blaschka <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M include/sysemu/kvm.h
    M kvm-all.c
    M target-arm/kvm.c
    M target-i386/kvm.c
    M target-mips/kvm.c
    M target-ppc/kvm.c
    M target-s390x/kvm.c

  Log Message:
  -----------
  kvm: extend kvm_irqchip_add_msi_route to work on s390

on s390 MSI-X irqs are presented as thin or adapter interrupts
for this we have to reorganize the routing entry to contain
valid information for the adapter interrupt code on s390.
To minimize impact on existing code we introduce an architecture
function to fixup the routing entry.

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


  Commit: 5435f1d77eb4e8cf5e4103f64f0ecbe9f2902c71
      
https://github.com/qemu/qemu/commit/5435f1d77eb4e8cf5e4103f64f0ecbe9f2902c71
  Author: Peter Maydell <address@hidden>
  Date:   2015-01-12 (Mon, 12 Jan 2015)

  Changed paths:
    M MAINTAINERS
    M default-configs/s390x-softmmu.mak
    M hw/s390x/Makefile.objs
    M hw/s390x/css.c
    M hw/s390x/css.h
    A hw/s390x/s390-pci-bus.c
    A hw/s390x/s390-pci-bus.h
    A hw/s390x/s390-pci-inst.c
    A hw/s390x/s390-pci-inst.h
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/sclp.c
    M include/hw/s390x/sclp.h
    M include/sysemu/kvm.h
    M kvm-all.c
    M target-arm/kvm.c
    M target-i386/kvm.c
    M target-mips/kvm.c
    M target-ppc/kvm.c
    M target-s390x/cpu.h
    M target-s390x/ioinst.c
    M target-s390x/ioinst.h
    M target-s390x/kvm.c

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

s390x patches for 2.3.

Highlight is support for PCI devices on s390x. Otherwise, performance
improvements (register sync) and small cleanups.

# gpg: Signature made Mon 12 Jan 2015 09:49:31 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"

* remotes/cohuck/tags/s390x-20150112-v3:
  kvm: extend kvm_irqchip_add_msi_route to work on s390
  s390: implement pci instructions
  s390: Add PCI bus support
  s390x/kvm: avoid syscalls by syncing registers with kvm_run
  s390x/kvm: sync register support helper function
  s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers
  s390x/ccw: fix oddity in machine class init

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


Compare: https://github.com/qemu/qemu/compare/64ea8038ffbf...5435f1d77eb4