[PULL,00/11] s390x changes for 2.3

The following changes since commit 99c9c3cb24e566258a0a141178934f9cb5198842:

  Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into staging (2014-12-11 18:27:02 +0000)

are available in the git repository at:


  git://github.com/cohuck/qemu tags/s390x-20141215

for you to fetch changes up to 5a9403c9bc36aaa3431083f152251e775c38b386:

  s390x: update MAINTAINERS (2014-12-15 10:43:17 +0100)

----------------------------------------------------------------
390x patches for 2.3.

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

----------------------------------------------------------------

Cornelia Huck (2):
  s390x/ccw: fix oddity in machine class init
  s390x: update MAINTAINERS

David Hildenbrand (2):
  s390x/kvm: sync register support helper function
  s390x/kvm: avoid syscalls by syncing registers with kvm_run

Frank Blaschka (6):
  s390: Add PCI bus support
  s390: implement pci instructions
  kvm: extend kvm_irqchip_add_msi_route to work on s390
  s390/pci: add error event support
  s390/pci: implement stpcifc instruction
  s390/pci: remove unnecessary cpu_synchronize_state

Thomas Huth (1):
  s390x/css: Clean up unnecessary CONFIG_USER_ONLY wrappers

 MAINTAINERS                       |    2 +
 default-configs/s390x-softmmu.mak |    1 +
 hw/s390x/Makefile.objs            |    1 +
 hw/s390x/css.c                    |    5 +
 hw/s390x/css.h                    |    1 +
 hw/s390x/s390-pci-bus.c           |  594 ++++++++++++++++++++++++++
 hw/s390x/s390-pci-bus.h           |  251 +++++++++++
 hw/s390x/s390-pci-inst.c          |  835 +++++++++++++++++++++++++++++++++++++
 hw/s390x/s390-pci-inst.h          |  288 +++++++++++++
 hw/s390x/s390-virtio-ccw.c        |    9 +-
 hw/s390x/sclp.c                   |   10 +-
 include/hw/s390x/sclp.h           |    8 +
 include/sysemu/kvm.h              |    4 +
 kvm-all.c                         |    7 +
 target-arm/kvm.c                  |    6 +
 target-i386/kvm.c                 |    6 +
 target-mips/kvm.c                 |    6 +
 target-ppc/kvm.c                  |    6 +
 target-s390x/cpu.h                |   81 ----
 target-s390x/ioinst.c             |   52 +++
 target-s390x/ioinst.h             |    1 +
 target-s390x/kvm.c                |  273 ++++++++++--
 22 files changed, 2332 insertions(+), 115 deletions(-)
 create mode 100644 hw/s390x/s390-pci-bus.c
 create mode 100644 hw/s390x/s390-pci-bus.h
 create mode 100644 hw/s390x/s390-pci-inst.c
 create mode 100644 hw/s390x/s390-pci-inst.h

On 15 December 2014 at 11:35, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> The following changes since commit 99c9c3cb24e566258a0a141178934f9cb5198842:
>
>   Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into staging (2014-12-11 18:27:02 +0000)
>
> are available in the git repository at:
>
>
>   git://github.com/cohuck/qemu tags/s390x-20141215
>
> for you to fetch changes up to 5a9403c9bc36aaa3431083f152251e775c38b386:
>
>   s390x: update MAINTAINERS (2014-12-15 10:43:17 +0100)

Hi; I'm afraid this doesn't build for win32 or MacOSX
or 32-bit Linux:

32-bit Linux failures:
hw/s390x/s390-pci-bus.c: In function 's390_guest_io_table_walk':
hw/s390x/s390-pci-bus.c:283:11: error: cast from pointer to integer of
different size [-Werror=pointer-to-int-cast]
hw/s390x/s390-pci-bus.c:291:11: error: cast from pointer to integer of
different size [-Werror=pointer-to-int-cast]

Windows failures:

/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c: In
function ‘s390_guest_io_table_walk’:
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:283:
warning: cast from pointer to integer of different size
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:291:
warning: cast from pointer to integer of different size
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c: In
function ‘s390_translate_iommu’:
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:325:
warning: integer constant is too large for ‘long’ type

(those are just warnings but should be fixed anyway)

/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:15:23:
warning: sys/ioctl.h: No such file or directory
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:16:22:
warning: sys/mman.h: No such file or directory
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:18:23:
warning: linux/kvm.h: No such file or directory
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:19:24:
warning: asm/ptrace.h: No such file or directory
In file included from
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:32:
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:25:
error: expected specifier-qualifier-list before ‘__uint16_t’
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:30:
error: expected specifier-qualifier-list before ‘__uint16_t’
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:55:
error: expected specifier-qualifier-list before ‘__uint16_t’
/home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:92:
error: expected specifier-qualifier-list before ‘__uint32_t’

...and a lot of other stuff that's probably just cascade from
trying to include a bunch of Linux headers.

MacOSX builds also fail for lack of linux/kvm.h.

Incidentally, trying to include kvm.h is really a
bad idea unless guarded by CONFIG_KVM, even on Linux. You'll
get whatever the system include directory's kvm.h has, which
might be older than the one we ship in the QEMU tree and is
quite likely for a different architecture.

thanks
-- PMM

On Mon, 15 Dec 2014 13:10:51 +0000
Peter Maydell <peter.maydell@linaro.org> wrote:

> On 15 December 2014 at 11:35, Cornelia Huck <cornelia.huck@de.ibm.com> wrote:
> > The following changes since commit 99c9c3cb24e566258a0a141178934f9cb5198842:
> >
> >   Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2014-12-11' into staging (2014-12-11 18:27:02 +0000)
> >
> > are available in the git repository at:
> >
> >
> >   git://github.com/cohuck/qemu tags/s390x-20141215
> >
> > for you to fetch changes up to 5a9403c9bc36aaa3431083f152251e775c38b386:
> >
> >   s390x: update MAINTAINERS (2014-12-15 10:43:17 +0100)
> 
> Hi; I'm afraid this doesn't build for win32 or MacOSX
> or 32-bit Linux:
> 
> 32-bit Linux failures:
> hw/s390x/s390-pci-bus.c: In function 's390_guest_io_table_walk':
> hw/s390x/s390-pci-bus.c:283:11: error: cast from pointer to integer of
> different size [-Werror=pointer-to-int-cast]
> hw/s390x/s390-pci-bus.c:291:11: error: cast from pointer to integer of
> different size [-Werror=pointer-to-int-cast]
> 
> Windows failures:
> 
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c: In
> function ‘s390_guest_io_table_walk’:
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:283:
> warning: cast from pointer to integer of different size
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:291:
> warning: cast from pointer to integer of different size
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c: In
> function ‘s390_translate_iommu’:
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-bus.c:325:
> warning: integer constant is too large for ‘long’ type
> 
> (those are just warnings but should be fixed anyway)
> 
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:15:23:
> warning: sys/ioctl.h: No such file or directory
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:16:22:
> warning: sys/mman.h: No such file or directory
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:18:23:
> warning: linux/kvm.h: No such file or directory
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:19:24:
> warning: asm/ptrace.h: No such file or directory
> In file included from
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.c:32:
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:25:
> error: expected specifier-qualifier-list before ‘__uint16_t’
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:30:
> error: expected specifier-qualifier-list before ‘__uint16_t’
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:55:
> error: expected specifier-qualifier-list before ‘__uint16_t’
> /home/petmay01/linaro/qemu-for-merges/hw/s390x/s390-pci-inst.h:92:
> error: expected specifier-qualifier-list before ‘__uint32_t’
> 
> ...and a lot of other stuff that's probably just cascade from
> trying to include a bunch of Linux headers.
> 
> MacOSX builds also fail for lack of linux/kvm.h.
> 
> Incidentally, trying to include kvm.h is really a
> bad idea unless guarded by CONFIG_KVM, even on Linux. You'll
> get whatever the system include directory's kvm.h has, which
> might be older than the one we ship in the QEMU tree and is
> quite likely for a different architecture.

Sorry, my builds did not catch this :(

Frank, could you please take a look at the pci build failures?