qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 808e66: s390x/css: use macro for event-inform


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 808e66: s390x/css: use macro for event-information pending...
Date: Thu, 31 Aug 2017 05:44:45 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 808e668bbc8db6faa9ffaa802628711f36fe659b
      
https://github.com/qemu/qemu/commit/808e668bbc8db6faa9ffaa802628711f36fe659b
  Author: Dong Jia Shi <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x/css: use macro for event-information pending error recover code

Let's use a macro for the ERC (error recover code) when generating a
Channel Subsystem Event-information pending CRW (channel report word).

While we are at it, let's also add all other ERCs.

Signed-off-by: Dong Jia Shi <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5c8d6f008c0555b54cf10550fa86199a2cfabbca
      
https://github.com/qemu/qemu/commit/5c8d6f008c0555b54cf10550fa86199a2cfabbca
  Author: Dong Jia Shi <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x/css: generate solicited crw for rchp completion signaling

A successful completion of rchp should signal a solicited channel path
initialized CRW (channel report word), while the current implementation
always generates an un-solicited one. Let's fix this.

Reported-by: Halil Pasic <address@hidden>
Signed-off-by: Dong Jia Shi <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 70d8d9a0c9bc599d8ae99dd65ff8535adb2acdfc
      
https://github.com/qemu/qemu/commit/70d8d9a0c9bc599d8ae99dd65ff8535adb2acdfc
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x: introduce 2.11 compat machine

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


  Commit: 0d4fa4996fc5ee56ea7d072e272b8e69948460a5
      
https://github.com/qemu/qemu/commit/0d4fa4996fc5ee56ea7d072e272b8e69948460a5
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/ipl.c

  Log Message:
  -----------
  s390x/ipl: The s390-ipl device is not hot-pluggable

The s390-ipl device can not be created by the user, since it is meant only
to  be instantiated once internally to load the ROMs and kernel. If the user
tries to do a "device_add s390-ipl" via the monitor later, QEMU aborts with
a "ROM images must be loaded at startup" error message.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 83898cce62ba25a473af6a164388105994481e9c
      
https://github.com/qemu/qemu/commit/83898cce62ba25a473af6a164388105994481e9c
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M tests/boot-sector.c

  Log Message:
  -----------
  tests/boot-sector: Do not overwrite the x86 buffer on other architectures

Re-using the boot_sector code buffer from x86 for other architectures
is not very nice, especially if we add more architectures later. It's
also ugly that the test uses a huge pre-initialized array at all - the
size of the executable is very huge due to this array. So let's use a
separate buffer for each architecture instead, allocated from the heap,
so that we really just use the memory that we need.

Suggested-by: Michael Tsirkin <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: b1b2feac9432869a129b5958cd697d2870ffcc6b
      
https://github.com/qemu/qemu/commit/b1b2feac9432869a129b5958cd697d2870ffcc6b
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M tests/Makefile.include
    M tests/boot-sector.c
    M tests/pxe-test.c

  Log Message:
  -----------
  tests/pxe: Check virtio-net-ccw on s390x

Now that we've got a firmware that can do TFTP booting on s390x (i.e.
the pc-bios/s390-netboot.img), we can enable the PXE tester for this
architecture, too.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7f57d58d6a160fdb3b3020d985ddbb3c95fe964c
      
https://github.com/qemu/qemu/commit/7f57d58d6a160fdb3b3020d985ddbb3c95fe964c
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M tests/Makefile.include
    M tests/test-filter-mirror.c
    M tests/test-filter-redirector.c

  Log Message:
  -----------
  tests: Run filter-redirector and -mirror test only on POSIX systems

This way we can get rid of the ugly #ifdefs in the code which makes
it easier to extend later.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Reviewed-by: Zhang Chen <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ea5bef49eadd240c7924f287f2da1bb457a3f92c
      
https://github.com/qemu/qemu/commit/ea5bef49eadd240c7924f287f2da1bb457a3f92c
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M tests/Makefile.include
    M tests/test-filter-mirror.c
    M tests/test-filter-redirector.c
    M tests/test-netfilter.c

  Log Message:
  -----------
  tests: Add network filter tests to the check-qtest-s390x list

With some small modifications, we can also use the the netfilter,
the filter-mirror and the filter-redirector tests on s390x.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Zhang Chen <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: a8aec856b8e708d8346c60a17f72fc774fd41af5
      
https://github.com/qemu/qemu/commit/a8aec856b8e708d8346c60a17f72fc774fd41af5
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/misc_helper.c

  Log Message:
  -----------
  s390x/tcg: specification exception for unknown diag

While the PoP is silent on the issue, z/VM documentation states
that unknown diagnose codes trigger a specification exception.
We already do that when running with kvm, so change tcg to do so
as well.

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


  Commit: 84ebd3e8c7d4fe955b359b9aac84395907b0412e
      
https://github.com/qemu/qemu/commit/84ebd3e8c7d4fe955b359b9aac84395907b0412e
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/watchdog/wdt_diag288.c

  Log Message:
  -----------
  watchdog/wdt_diag288: Mark diag288 watchdog as non-hotpluggable

QEMU currently aborts when the user tries to hot-unplug a diag288
device:

$ qemu-system-s390x -nographic -nodefaults -S -monitor stdio
QEMU 2.9.92 monitor - type 'help' for more information
(qemu) device_add diag288,id=x
(qemu) device_del x
**
ERROR:qemu/qdev-monitor.c:872:qdev_unplug: assertion failed: (hotplug_ctrl)
Aborted (core dumped)

The device is not designed as hot-pluggable (it should only be used
via the "-watchdog" parameter), so let's simply remove the possibility
to hotplug it to prevent that users can run into this ugly situation.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: eb569af835b400a25e45520e7ea872134dedcd02
      
https://github.com/qemu/qemu/commit/eb569af835b400a25e45520e7ea872134dedcd02
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/misc_helper.c

  Log Message:
  -----------
  s390x: wire up diag288 in tcg

Make the diag288 watchdog useable via tcg as well.

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


  Commit: e9a3591fa09f273592451f8b9f83692bcbedb60c
      
https://github.com/qemu/qemu/commit/e9a3591fa09f273592451f8b9f83692bcbedb60c
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: enable --s390-pgste linker option

KVM guests on s390 need a different page table layout than normal
processes (2kb page table + 2kb page status extensions vs 2kb page table
only). As of today this has to be enabled via the vm.allocate_pgste
sysctl.

Newer kernels (>= 4.12) on s390 check for an S390_PGSTE program header
and enable the pgste page table extensions in that case. This makes the
vm.allocate_pgste sysctl unnecessary. We enable this program header for
the s390 system emulation (qemu-system-s390x) if we build on s390
- for s390 system emulation
- the linker supports --s390-pgste (binutils >= 2.29)
- KVM is enabled

This will allow distributions to disable the global vm.allocate_pgste
sysctl, which will improve the page table allocation for non KVM
processes as only 2kb chunks are necessary.

Cc: Christian Ehrhardt <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: Dan Horak <address@hidden>
Cc: David Hildenbrand <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
Acked-by: Janosch Frank <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5f8c92e1d50d3629116497dd0a446e8cb28af7f8
      
https://github.com/qemu/qemu/commit/5f8c92e1d50d3629116497dd0a446e8cb28af7f8
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M fsdev/Makefile.objs
    M hw/9pfs/Makefile.objs
    M hw/Makefile.objs

  Log Message:
  -----------
  9pfs: fix dependencies

Nothing in fsdev/ or hw/9pfs/ depends on pci; it should rather depend
on CONFIG_VIRTFS and CONFIG_VIRTIO/CONFIG_XEN only.

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


  Commit: 88c725c78e87eecb061f882177c7a6a2ac1059ad
      
https://github.com/qemu/qemu/commit/88c725c78e87eecb061f882177c7a6a2ac1059ad
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M accel/kvm/kvm-all.c
    M hw/pci/pci-stub.c
    M hw/pci/pci.c
    M include/hw/pci/pci.h

  Log Message:
  -----------
  kvm: remove hard dependency on pci

The msi routing code in kvm calls some pci functions: provide
some stubs to enable builds without pci.

Also, to make this more obvious, guard them via a pci_available boolean
(which also can be reused in other places).

Fixes: e1d4fb2de ("kvm-irqchip: x86: add msi route notify fn")
Fixes: 767a554a0 ("kvm-all: Pass requester ID to MSI routing functions")
Reviewed-by: Pierre Morel <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5838d65770aea0bc7d4f26bc4e5efbd0e5aeaa7a
      
https://github.com/qemu/qemu/commit/5838d65770aea0bc7d4f26bc4e5efbd0e5aeaa7a
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/Makefile.objs
    A hw/s390x/s390-pci-stub.c
    M include/hw/s390x/sclp.h

  Log Message:
  -----------
  s390x/pci: add stubs

Some non-pci code calls into zpci code. Provide some stubs for builds
without pci.

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


  Commit: 1c5deaec77870961f6575e946d5af7a7d0831e57
      
https://github.com/qemu/qemu/commit/1c5deaec77870961f6575e946d5af7a7d0831e57
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-stub.c
    M target/s390x/ioinst.c

  Log Message:
  -----------
  s390x: chsc nt2 events are pci-only

The nt2 event class is pci-only - don't look for events if pci is
not in the active cpu model.

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


  Commit: 21eb052cf2934fcf94e671f0a84d596874538459
      
https://github.com/qemu/qemu/commit/21eb052cf2934fcf94e671f0a84d596874538459
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/pci: do not advertise pci on non-pci builds

Only set the zpci feature bit on builds that actually support pci.

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


  Commit: d32bd032d8fde41281aae34c16a4aa97e9acfeac
      
https://github.com/qemu/qemu/commit/d32bd032d8fde41281aae34c16a4aa97e9acfeac
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x/ccw: create s390 phb conditionally

Don't create the s390 pci host bridge if we do not provide the zpci
facility.

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


  Commit: 80b7a265362c870f95fb5ca1f7e7a02c0fa0db3e
      
https://github.com/qemu/qemu/commit/80b7a265362c870f95fb5ca1f7e7a02c0fa0db3e
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x/sclp: properly guard pci-specific functions

If we do not provide zpci, pci reconfiguration via sclp is not available
either. I/O adapter configuration, however, should always be present.

Rename the values that refer to I/O adapter configuration (instead of only
pci) to make things clearer.

Move length checking of the sccb for I/O adapter configuration into the
common sclp code (out of the pci code). This also fixes an issue that
the pci code would refer to a field in the sccb before checking whether
it was actually long enough.

Check for the adapter type in the sccb and return unrecognized adapter
type if the guest tries to issue I/O adapter configure/deconfigure for
a type other than pci or for pci if the zpci facility is not provided.

Reviewed-by: Pierre Morel <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 42f865da967aa6965a50336154bd4f038df96993
      
https://github.com/qemu/qemu/commit/42f865da967aa6965a50336154bd4f038df96993
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/pci: fence off instructions for non-pci

If a guest running on a machine without zpci issues a pci instruction,
throw them an exception.

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


  Commit: 1ecb285dc9333ebbf1b32b55d03650414fbdbe41
      
https://github.com/qemu/qemu/commit/1ecb285dc9333ebbf1b32b55d03650414fbdbe41
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M default-configs/s390x-softmmu.mak

  Log Message:
  -----------
  s390x: refine pci dependencies

VIRTIO_PCI should properly depend on CONFIG_PCI.
With this change, we can switch off pci for s390x by removing
'CONFIG_PCI=y' from the default config.

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


  Commit: 574ee06de9c4fe63c90be90dc9c747fc9382bb2b
      
https://github.com/qemu/qemu/commit/574ee06de9c4fe63c90be90dc9c747fc9382bb2b
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-skeys-kvm.c
    M hw/s390x/s390-skeys.c

  Log Message:
  -----------
  s390x/s390-skeys: Mark the storage key devices with user_creatable = false

QEMU currently aborts if the user tries to create a skey device:

$ s390x-softmmu/qemu-system-s390x -nographic -device s390-skeys-qemu
qemu-system-s390x: hw/s390x/s390-skeys.c:30: s390_get_skeys_device:
 Assertion `ss' failed.
Aborted (core dumped)

The storage key devices are only meant to be instantiated one time,
internally. They can not be used by the user, so mark them with
user_creatable = false.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Claudio Imbrenda <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: fba5f6feba119c2c2ac3ecc8f7cb630085611c93
      
https://github.com/qemu/qemu/commit/fba5f6feba119c2c2ac3ecc8f7cb630085611c93
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/sclp.c
    M target/s390x/cpu.h
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: drop KVMState parameter from s390_get_memslot_count()

Not needed at that point.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 708f99c366f7ea043123a894c416a24384f50b5c
      
https://github.com/qemu/qemu/commit/708f99c366f7ea043123a894c416a24384f50b5c
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: drop KVMState parameter from kvm_s390_set_mem_limit()

Not needed at that point. Also drop it from kvm_s390_query_mem_limit()
we call in kvm_s390_set_mem_limit().

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: ad4ad5f5125be3de5613221e073d5ebb4dd7fb89
      
https://github.com/qemu/qemu/commit/ad4ad5f5125be3de5613221e073d5ebb4dd7fb89
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  target/s390x: simplify ri_allowed()

Only used in KVM and there is no reason why it shouldn't be allowed for
tcg - it is simply not available.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c50f65118b429e6847d5c11b1a20a560d61c34b7
      
https://github.com/qemu/qemu/commit/c50f65118b429e6847d5c11b1a20a560d61c34b7
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  target/s390x: simplify gs_allowed()

No need for kvm_enabled() as this function is only called from KVM and
there is no reason why it shouldn't be allowed for tcg. It is simply not
available under tcg.

Also, there is no need to check for the machine type anymore. Just like
ri_enabled(), we can directly use the stored flag, which results in
"true" for the "none" machine.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: fe7cb8eab27811af76c54d29658fa83d9a9095b9
      
https://github.com/qemu/qemu/commit/fe7cb8eab27811af76c54d29658fa83d9a9095b9
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  target/s390x: no need to pass kvm_state to savevm_gtod handlers

Let's avoid any KVM stuff in s390-virtio-ccw.c. This parameter is simply
ignored.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 7d00bf94dfa41d0d5759cc3ebe02b66a780c5789
      
https://github.com/qemu/qemu/commit/7d00bf94dfa41d0d5759cc3ebe02b66a780c5789
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-virtio.c
    M target/s390x/cpu.h
    M target/s390x/cpu_models.c

  Log Message:
  -----------
  s390x/cpumodel: factor out determination of default model name

Now we can drop inclusion of "sysemu/kvm.h" from "s390-virtio.c".

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: e654ca84b6c39678f5d1478de6662920976e21dd
      
https://github.com/qemu/qemu/commit/e654ca84b6c39678f5d1478de6662920976e21dd
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-stattrib.c
    M hw/s390x/sclp.c
    M hw/s390x/sclpcpu.c
    M target/s390x/arch_dump.c

  Log Message:
  -----------
  s390x: drop inclusion of sysemu/kvm.h from some files

s390-stattrib.c needs definition of TARGET_PAGE_SIZE, solve it via cpu.h.

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


  Commit: 1083a3f45c8077828697b5e43510d90de943c640
      
https://github.com/qemu/qemu/commit/1083a3f45c8077828697b5e43510d90de943c640
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-virtio.h
    M target/s390x/cpu.h

  Log Message:
  -----------
  target/s390x: move gtod_*() declarations to s390-virtio.h

The functions are not used in target/s390x/ so a header in hw/s390x/
is a better place.

Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c534055031bec5717b7a447fc821ca9fa2b46dcf
      
https://github.com/qemu/qemu/commit/c534055031bec5717b7a447fc821ca9fa2b46dcf
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/helper.c

  Log Message:
  -----------
  target/s390x: move cc_name() to helper.c

While at it, move the translations into the function and properly pass
enum cc_op as parameter. We can't move it to cc_helper.c as this would
break --disable-tcg.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 12e1e8f1aa3e79f408adadaaaff2148e56ba5068
      
https://github.com/qemu/qemu/commit/12e1e8f1aa3e79f408adadaaaff2148e56ba5068
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/excp_helper.c

  Log Message:
  -----------
  target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c

Only used in that file.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c07a1009669ebf7ed91b131a857eed6ea9a08115
      
https://github.com/qemu/qemu/commit/c07a1009669ebf7ed91b131a857eed6ea9a08115
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/mem_helper.c

  Log Message:
  -----------
  target/s390x: move psw_key_valid() to mem_helper.c

Only used in that file.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 52c91545412e71a9fe08655947fff1b619003db6
      
https://github.com/qemu/qemu/commit/52c91545412e71a9fe08655947fff1b619003db6
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/diag.c

  Log Message:
  -----------
  target/s390x: move s390_do_cpu_reset() to diag.c

Only used in that file. Also drop the comment, not really needed.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: d9b8daf9963821ab9a5c812f989f27344ddc10fa
      
https://github.com/qemu/qemu/commit/d9b8daf9963821ab9a5c812f989f27344ddc10fa
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h
    M target/s390x/misc_helper.c

  Log Message:
  -----------
  target/s390x: move get_per_in_range() to misc_helper.c

Only used in that file.

Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 4e58b838dd2028988fb932a96e3e907df8b5e59f
      
https://github.com/qemu/qemu/commit/4e58b838dd2028988fb932a96e3e907df8b5e59f
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/arch_dump.c
    M target/s390x/cc_helper.c
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/cpu_models.c
    M target/s390x/diag.c
    M target/s390x/excp_helper.c
    M target/s390x/fpu_helper.c
    M target/s390x/gdbstub.c
    M target/s390x/helper.c
    M target/s390x/int_helper.c
    A target/s390x/internal.h
    M target/s390x/interrupt.c
    M target/s390x/ioinst.c
    M target/s390x/kvm.c
    M target/s390x/machine.c
    M target/s390x/mem_helper.c
    M target/s390x/misc_helper.c
    M target/s390x/mmu_helper.c
    M target/s390x/translate.c

  Log Message:
  -----------
  target/s390x: introduce internal.h

cpu.h should only contain what really has to be accessed outside of
target/s390x/. Add internal.h which can only be used inside target/s390x/.

Move everything that isn't fast enough to run away and restructure it
right away. We'll move all kvm_* stuff later.

Minor style fixes to avoid checkpatch warning to:
- struct Lowcore: "{" goes into same line as typedef
- struct LowCore: add spaces around "-" in array length calculations
- time2tod() and tod2time(): move "{" to separate line
- get_per_atmid(): add space between ")" and "?". Move cases by one char.
- get_per_atmid(): drop extra paremthesis around (1 << 6)

Change license of new file to GPL2+ and keep copyright notice.

Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: b6089b059c111ae4c083a5f6d1b6038ec7c92b47
      
https://github.com/qemu/qemu/commit/b6089b059c111ae4c083a5f6d1b6038ec7c92b47
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.c
    M target/s390x/cpu.h

  Log Message:
  -----------
  target/s390x: move a couple of functions to cpu.c

Prepare to move more stuff (especially KVM related) from cpu.h to
internal.h.

Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 5e7164c50c9f6ac531a0e3c7a49b3771ddefb8f3
      
https://github.com/qemu/qemu/commit/5e7164c50c9f6ac531a0e3c7a49b3771ddefb8f3
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x: avoid calling kvm_ functions outside of target/s390x/

Let's just introduce an helper.

Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: f16bbb9bbde3285dd40c806b46f80b49dfebfc4a
      
https://github.com/qemu/qemu/commit/f16bbb9bbde3285dd40c806b46f80b49dfebfc4a
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/intc/s390_flic_kvm.c
    M hw/s390x/s390-stattrib-kvm.c
    M include/hw/s390x/css.h
    M target/s390x/Makefile.objs
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/cpu_models.c
    M target/s390x/interrupt.c
    A target/s390x/kvm-stub.c
    M target/s390x/kvm.c
    A target/s390x/kvm_s390x.h
    M target/s390x/machine.c
    M target/s390x/mmu_helper.c

  Log Message:
  -----------
  s390x/kvm: move KVM declarations and stubs to separate files

Let's do it just like the other architectures. Introduce kvm-stub.c
for stubs and kvm_s390x.h for the declarations.

Change license to GPL2+ and keep copyright notice.

As we are dropping the sysemu/kvm.h include from cpu.h, fix up includes.

Suggested-by: Thomas Huth <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: c862bddbcb9fc5993a26365d3f2adcc7fba9fbe4
      
https://github.com/qemu/qemu/commit/c862bddbcb9fc5993a26365d3f2adcc7fba9fbe4
  Author: David Hildenbrand <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M target/s390x/cpu.h

  Log Message:
  -----------
  target/s390x: cleanup cpu.h

Let's reshuffle the function prototypes so we get a cleaner outline
of the files.

Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 3ea6d20e0baacb4a1211ed0ea57db14e2fc927ce
      
https://github.com/qemu/qemu/commit/3ea6d20e0baacb4a1211ed0ea57db14e2fc927ce
  Author: Thomas Huth <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

  Changed paths:
    M hw/s390x/s390-stattrib-kvm.c
    M hw/s390x/s390-stattrib.c

  Log Message:
  -----------
  s390x/s390-stattrib: Mark the storage attribute as not user_creatable

The storage attribute devices are only meant to be instantiated one
time, internally. They can not be used by the user, so mark them with
user_creatable = false.

Suggested-by: Claudio Imbrenda <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Claudio Imbrenda <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 3a1e4561ad63b303b092387ae006bd41468ece63
      
https://github.com/qemu/qemu/commit/3a1e4561ad63b303b092387ae006bd41468ece63
  Author: Farhan Ali <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390-ccw: Fix alignment for CCW1

The commit 198c0d1f9df8c4 s390x/css: check ccw address validity
exposes an alignment issue in ccw bios.

According to PoP the CCW must be doubleword aligned. Let's fix
this in the bios.

Cc: address@hidden
Signed-off-by: Farhan Ali <address@hidden>
Reviewed-by: Halil Pasic <address@hidden>
Reviewed-by: Eric Farman <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 917726611ef352593f7e3168741a1e33c81dba00
      
https://github.com/qemu/qemu/commit/917726611ef352593f7e3168741a1e33c81dba00
  Author: Cornelia Huck <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  pc-bios/s390-ccw.img: update image

Contains the following commit:
- s390-ccw: Fix alignment for CCW1

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


  Commit: 2f21b8d431030bcb7478ee9521bdfd3d0ef3901d
      
https://github.com/qemu/qemu/commit/2f21b8d431030bcb7478ee9521bdfd3d0ef3901d
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-08-30 (Wed, 30 Aug 2017)

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

  Log Message:
  -----------
  s390x/pci: fixup trap_msix()

The function trap_msix() is to check if pcistg instruction would access
msix table entries. The correct boundary condition should be
[table_offset, table_offset+entries*entry_size). But the current
condition calculated misses the last entry. So let's fixup it.

Acked-by: Dong Jia Shi <address@hidden>
Reviewed-by: Pierre Morel <address@hidden>
Signed-off-by: Yi Min Zhao <address@hidden>
Message-Id: <address@hidden>
Cc: address@hidden
Signed-off-by: Cornelia Huck <address@hidden>


  Commit: 1415e8ea1fa24ad94b49a03aaf9d21fc95aaa129
      
https://github.com/qemu/qemu/commit/1415e8ea1fa24ad94b49a03aaf9d21fc95aaa129
  Author: Peter Maydell <address@hidden>
  Date:   2017-08-31 (Thu, 31 Aug 2017)

  Changed paths:
    M accel/kvm/kvm-all.c
    M configure
    M default-configs/s390x-softmmu.mak
    M fsdev/Makefile.objs
    M hw/9pfs/Makefile.objs
    M hw/Makefile.objs
    M hw/intc/s390_flic_kvm.c
    M hw/pci/pci-stub.c
    M hw/pci/pci.c
    M hw/s390x/Makefile.objs
    M hw/s390x/css.c
    M hw/s390x/ipl.c
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/s390-pci-bus.h
    M hw/s390x/s390-pci-inst.c
    A hw/s390x/s390-pci-stub.c
    M hw/s390x/s390-skeys-kvm.c
    M hw/s390x/s390-skeys.c
    M hw/s390x/s390-stattrib-kvm.c
    M hw/s390x/s390-stattrib.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/s390-virtio.c
    M hw/s390x/s390-virtio.h
    M hw/s390x/sclp.c
    M hw/s390x/sclpcpu.c
    M hw/watchdog/wdt_diag288.c
    M include/hw/compat.h
    M include/hw/pci/pci.h
    M include/hw/s390x/css.h
    M include/hw/s390x/ioinst.h
    M include/hw/s390x/sclp.h
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/cio.h
    M target/s390x/Makefile.objs
    M target/s390x/arch_dump.c
    M target/s390x/cc_helper.c
    M target/s390x/cpu.c
    M target/s390x/cpu.h
    M target/s390x/cpu_models.c
    M target/s390x/diag.c
    M target/s390x/excp_helper.c
    M target/s390x/fpu_helper.c
    M target/s390x/gdbstub.c
    M target/s390x/helper.c
    M target/s390x/int_helper.c
    A target/s390x/internal.h
    M target/s390x/interrupt.c
    M target/s390x/ioinst.c
    A target/s390x/kvm-stub.c
    M target/s390x/kvm.c
    A target/s390x/kvm_s390x.h
    M target/s390x/machine.c
    M target/s390x/mem_helper.c
    M target/s390x/misc_helper.c
    M target/s390x/mmu_helper.c
    M target/s390x/translate.c
    M tests/Makefile.include
    M tests/boot-sector.c
    M tests/pxe-test.c
    M tests/test-filter-mirror.c
    M tests/test-filter-redirector.c
    M tests/test-netfilter.c

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

First batch of s390x patches:
- 2.11 compat machine
- support the new --s390-pgste linker option, making it possible to
  avoid enabling the global vm.allocate_pgste systl if all pieces
  are in place
- correctly identify some devices as not hotpluggable
- clean up some tests and enable them for s390x
- wire up the diag288 watchdog in tcg
- clean up dependencies on CONFIG_PCI, making it possible to disable
  it by hand
- lots of cleanup in target/s390x/
- fix alignment of the ccw1 structure in the s390-ccw bios
- and some more bugfixes

# gpg: Signature made Wed 30 Aug 2017 17:40:34 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# gpg:                 aka "Cornelia Huck <address@hidden>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20170830: (44 commits)
  s390x/pci: fixup trap_msix()
  pc-bios/s390-ccw.img: update image
  s390-ccw: Fix alignment for CCW1
  s390x/s390-stattrib: Mark the storage attribute as not user_creatable
  target/s390x: cleanup cpu.h
  s390x/kvm: move KVM declarations and stubs to separate files
  s390x: avoid calling kvm_ functions outside of target/s390x/
  target/s390x: move a couple of functions to cpu.c
  target/s390x: introduce internal.h
  target/s390x: move get_per_in_range() to misc_helper.c
  target/s390x: move s390_do_cpu_reset() to diag.c
  target/s390x: move psw_key_valid() to mem_helper.c
  target/s390x: move cpu_mmu_idx_to_asc() to excp_helper.c
  target/s390x: move cc_name() to helper.c
  target/s390x: move gtod_*() declarations to s390-virtio.h
  s390x: drop inclusion of sysemu/kvm.h from some files
  s390x/cpumodel: factor out determination of default model name
  target/s390x: no need to pass kvm_state to savevm_gtod handlers
  target/s390x: simplify gs_allowed()
  target/s390x: simplify ri_allowed()
  ...

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


Compare: https://github.com/qemu/qemu/compare/1201d308519f...1415e8ea1fa2

reply via email to

[Prev in Thread] Current Thread [Next in Thread]