qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 03f47e: s390x/kvm: Rework cmma management


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 03f47e: s390x/kvm: Rework cmma management
Date: Fri, 14 Jul 2017 07:31:46 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 03f47ee49e1478b5ffffb3a9b6203c672903196c
      
https://github.com/qemu/qemu/commit/03f47ee49e1478b5ffffb3a9b6203c672903196c
  Author: Janosch Frank <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/kvm: Rework cmma management

Let's keep track of cmma enablement and move the mem_path check into
the actual enablement. This now also warns users that do not use
cpu-models about disabled cmma when using huge pages.

Signed-off-by: Janosch Frank <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 3272f0e22fefa4a364cdbdb01975f9178177ab37
      
https://github.com/qemu/qemu/commit/3272f0e22fefa4a364cdbdb01975f9178177ab37
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M include/standard-headers/asm-x86/hyperv.h
    M include/standard-headers/linux/input-event-codes.h
    M include/standard-headers/linux/pci_regs.h
    M linux-headers/asm-arm/kvm.h
    M linux-headers/asm-arm64/kvm.h
    M linux-headers/asm-powerpc/kvm.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/linux/kvm.h

  Log Message:
  -----------
  linux-headers: update to 4.13-rc0

commit af3c8d98508d37541d4bf57f13a984a7f73a328c
    Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux

There is a change pending for v4.13-rc1 in linux-headers/linux/kvm.h
I will submit a fixup patch for 2.10 as soon as it hits the kernel.

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


  Commit: 903fd80b03243476a97522b79d4a7c8546dfe3df
      
https://github.com/qemu/qemu/commit/903fd80b03243476a97522b79d4a7c8546dfe3df
  Author: Claudio Imbrenda <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/s390x/Makefile.objs
    A hw/s390x/s390-stattrib-kvm.c
    A hw/s390x/s390-stattrib.c
    M hw/s390x/s390-virtio-ccw.c
    A include/hw/s390x/storage-attributes.h

  Log Message:
  -----------
  s390x/migration: Storage attributes device

Storage attributes device, like we have for storage keys.

Signed-off-by: Claudio Imbrenda <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: f860d49753300d4e57f49e4d9016e79e5c5ac2ee
      
https://github.com/qemu/qemu/commit/f860d49753300d4e57f49e4d9016e79e5c5ac2ee
  Author: Claudio Imbrenda <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hmp-commands-info.hx
    M hmp-commands.hx
    M hw/s390x/s390-stattrib.c
    M include/hw/s390x/storage-attributes.h
    M monitor.c

  Log Message:
  -----------
  s390x/migration: Monitor commands for storage attributes

Add an "info" monitor command to non-destructively inspect the state of
the storage attributes of the guest, and a normal command to toggle
migration mode (useful for debugging).

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


  Commit: ec3aadb13ed601f8d77bd4efd80b545ddc84c697
      
https://github.com/qemu/qemu/commit/ec3aadb13ed601f8d77bd4efd80b545ddc84c697
  Author: Jason J. Herne <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features_def.h
    M target/s390x/gen-features.c

  Log Message:
  -----------
  s390x/cpumodel: clean up spacing and comments

Clean up spacing and add comments to clarify difference between base, full and
default models.

Not having spacing around the model definitions in gen-features.c is
particularly frustrating as the reader tends to misinterpret which model they
are looking at or editing.

Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: c9ad8a7a53b9f167626a32fe7c1116f8844156db
      
https://github.com/qemu/qemu/commit/c9ad8a7a53b9f167626a32fe7c1116f8844156db
  Author: Jason J. Herne <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/cpumodel: provide compat handling for new cpu features

Provide a mechanism to disable features in compatibility machines.

Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 1497c1606615b0b08d1b1f78afd1dcf2585879c0
      
https://github.com/qemu/qemu/commit/1497c1606615b0b08d1b1f78afd1dcf2585879c0
  Author: Fei Li <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M hw/s390x/css-bridge.c
    M hw/s390x/css.c
    M hw/s390x/s390-pci-bus.c
    M include/hw/s390x/css.h
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  s390x: add flags field for registering I/O adapter

Introduce a new 'flags' field to IoAdapter to contain further
characteristics of the adapter, like whether the adapter is subject to
adapter-interruption suppression.

For the kvm case, pass this value in the 'flags' field when
registering an adapter.

Signed-off-by: Fei Li <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 6c1dd652a606f4446cdb8883ac68d6fb54b02e5c
      
https://github.com/qemu/qemu/commit/6c1dd652a606f4446cdb8883ac68d6fb54b02e5c
  Author: Fei Li <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  s390x/flic: introduce modify_ais_mode callback

In order to emulate the adapter interruption suppression (AIS)
facility properly, the guest needs to be able to modify the AIS mask.
Interrupt suppression will be handled via the flic (for kvm, via a
recently introduced kernel backend; for !kvm, in the flic code), so
let's introduce a method to change the mode via the flic interface.

We introduce the 'simm' and 'nimm' fields to QEMUS390FLICState
to store interruption modes for each ISC. Each bit in 'simm' and
'nimm' targets one ISC, and collaboratively indicate three modes:
ALL-Interruptions, SINGLE-Interruption and NO-Interruptions. This
interface can initiate most transitions between the states; transition
from SINGLE-Interruption to NO-Interruptions via adapter interrupt
injection will be introduced in a following patch. The meaningful
combinations are as follows:

    interruption mode | simm bit | nimm bit
    ------------------|----------|----------
       ALL      |    0     |     0
     SINGLE     |    1     |     0
       NO       |    1     |     1

Co-authored-by: Yi Min Zhao <address@hidden>
Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 1622ffd5151ad09c47785a380531ef1ebfc95be8
      
https://github.com/qemu/qemu/commit/1622ffd5151ad09c47785a380531ef1ebfc95be8
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M hw/intc/trace-events
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  s390x/flic: introduce inject_airq callback

Let's introduce a specialized way to inject adapter interrupts that,
unlike the common interrupt injection method, allows to take the
characteristics of the adapter into account.

For adapters subject to AIS facility:
- for non-kvm case, we handle the suppression for a given ISC in QEMU.
- for kvm case, we pass adapter id to kvm to do airq injection.

Add add tracepoint for suppressed airq and suppressing airq.

Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 2283f4d67a0e05ae056d2077f65496c3c4df5d6f
      
https://github.com/qemu/qemu/commit/2283f4d67a0e05ae056d2077f65496c3c4df5d6f
  Author: Fei Li <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/trace-events
    M include/hw/s390x/css.h
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/sic: realize SIC handling

Currently, we do nothing for the SIC instruction, but we need to
implement it properly. Let's add proper handling in the backend code.

Co-authored-by: Yi Min Zhao <address@hidden>
Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 25a08b8ded0f4f898b6b12c7ee2cf4c1c55cfcce
      
https://github.com/qemu/qemu/commit/25a08b8ded0f4f898b6b12c7ee2cf4c1c55cfcce
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/s390x/css.c
    M hw/s390x/s390-pci-bus.c
    M hw/s390x/virtio-ccw.c
    M include/hw/s390x/css.h

  Log Message:
  -----------
  s390x/css: update css_adapter_interrupt

Let's use the new inject_airq callback of flic to inject adapter
interrupts. For kvm case, if the kernel flic doesn't support the new
interface, the irq routine remains unchanged. For non-kvm case,
qemu-flic handles the suppression process.

Signed-off-by: Yi Min Zhao <address@hidden>
Signed-off-by: Fei Li <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: cec8bbf7d64a7f9d95921c99faca8ff62241572b
      
https://github.com/qemu/qemu/commit/cec8bbf7d64a7f9d95921c99faca8ff62241572b
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x: add helper get_machine_class

We will need the machine class at machine initialization time, so the
usual way via qdev won't do. Let's cache the machine class and also use
the default values of the base machine for capability discovery.

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


  Commit: 52629b3ba871e606a55e4366d82193055ad34d11
      
https://github.com/qemu/qemu/commit/52629b3ba871e606a55e4366d82193055ad34d11
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x: add css_migration_enabled to machine class

Currently the migration of the channel subsystem (css) is only partial
and is done by the virtio ccw proxies -- the only migratable css devices
existing at the moment.

With the current work on emulated and passthrough devices we need to
decouple the migration of the channel subsystem state from virtio ccw,
and have a separate section for it. A new section  however necessarily
breaks the migration compatibility.

So let us introduce a switch at the machine class, and put it in 'off'
state for now. We will turn the switch 'on' for future machines once all
preparations are met. For compatibility  machines the switch will stay
'off'.

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


  Commit: 457af62603c835a9fc235857b40140eaedcf999c
      
https://github.com/qemu/qemu/commit/457af62603c835a9fc235857b40140eaedcf999c
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/s390x/css.c

  Log Message:
  -----------
  s390x/css: add missing css state conditionally

Although we have recently vmstatified the migration of some css
infrastructure,  for some css entities there is still state to be
migrated left, because the focus was keeping migration stream
compatibility (that is basically everything as-is).

Let us add vmstate helpers and extend existing vmstate descriptions so
that we have everything we need. Let us guard the added state via
css_migration_enabled, so we keep the compatible behavior if css
migration is disabled.

Let's also annotate the bits which do not need to be migrated for better
readability.

Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Reviewed-by: Juan Quintela <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: ff443fe6b59cbbb4beb6186cc3986748626a2b57
      
https://github.com/qemu/qemu/commit/ff443fe6b59cbbb4beb6186cc3986748626a2b57
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/css: add ORB to SubchDev

Since we are going to need a migration compatibility breaking change to
activate ChannelSubSys migration let us use the opportunity to introduce
ORB to the SubchDev before that (otherwise we would need separate
handling e.g. a compat property).

The ORB will be useful for implementing IDA, or async handling of
subchannel work.

Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Guenther Hutzl <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: e996583eb35c8e3a182ed599318d30cb0be6a001
      
https://github.com/qemu/qemu/commit/e996583eb35c8e3a182ed599318d30cb0be6a001
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/css: activate ChannelSubSys migration

Turn on migration for the channel subsystem for the next machine.  For
legacy machines we still have to do things the old way.

Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: b5f5a3afb635109fa6c1d03a9c6e2653adde09a1
      
https://github.com/qemu/qemu/commit/b5f5a3afb635109fa6c1d03a9c6e2653adde09a1
  Author: Halil Pasic <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/css: use SubchDev.orb

Instead of passing around a pointer to ORB let us simplify some
function signatures by using the previously introduced ORB saved at the
subchannel (SubchDev).

Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 90806fec99d6cf32f627b66be3757901091dc7e9
      
https://github.com/qemu/qemu/commit/90806fec99d6cf32f627b66be3757901091dc7e9
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/bootmap.c
    A pc-bios/s390-ccw/libc.h
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/s390-ccw.h
    M pc-bios/s390-ccw/sclp.c
    M pc-bios/s390-ccw/virtio-scsi.c
    M pc-bios/s390-ccw/virtio.c

  Log Message:
  -----------
  pc-bios/s390-ccw: Move libc functions to separate header

The upcoming netboot code will use the libc from SLOF. To be able
to still use s390-ccw.h there, the libc related functions in this
header have to be moved to a different location.
And while we're at it, remove the duplicate memcpy() function from
sclp.c.

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


  Commit: af3bb73ab1352287848eec7f0ae395f26e004929
      
https://github.com/qemu/qemu/commit/af3bb73ab1352287848eec7f0ae395f26e004929
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/sclp.c

  Log Message:
  -----------
  pc-bios/s390-ccw: Move ebc2asc to sclp.c

We will later need this array in a file that we will link to the
netboot code, too. Since there is some ebcdic conversion done
in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
candidate.

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


  Commit: 867e039a06a02d3f2f8fa9e0246bda7917150fd9
      
https://github.com/qemu/qemu/commit/867e039a06a02d3f2f8fa9e0246bda7917150fd9
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/main.c
    M pc-bios/s390-ccw/s390-ccw.h
    A pc-bios/s390-ccw/virtio-blkdev.c
    M pc-bios/s390-ccw/virtio.c
    M pc-bios/s390-ccw/virtio.h

  Log Message:
  -----------
  pc-bios/s390-ccw: Move virtio-block related functions into a separate file

The netboot code is going to link against the code from virtio.c, too, so
we've got to move the virtio-block and -scsi related code out of the way.

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


  Commit: 3639f93f91fcba2c4d686653dcffb8224555b0a8
      
https://github.com/qemu/qemu/commit/3639f93f91fcba2c4d686653dcffb8224555b0a8
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Add a write() function for stdio

The stdio functions from the SLOF libc need a write() function for
printing text to stdout/stderr. Let's implement this function by
refactoring the code from sclp_print().

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


  Commit: 824df3b84b653e9069764c802048d98da51e19c3
      
https://github.com/qemu/qemu/commit/824df3b84b653e9069764c802048d98da51e19c3
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Move byteswap functions to a separate header

We'll need them in code that is not related to bootmap.h, so
they should reside in an independent header.

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


  Commit: ac7bec7cf9a203607b96935519457086e53b6b1f
      
https://github.com/qemu/qemu/commit/ac7bec7cf9a203607b96935519457086e53b6b1f
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Remove unused structs from virtio.h

Looks like they have never been used, so let's simply remove them.

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


  Commit: 59efbff1cb9dab4b02cadd639474ce1fee19277d
      
https://github.com/qemu/qemu/commit/59efbff1cb9dab4b02cadd639474ce1fee19277d
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  pc-bios/s390-ccw: Add code for virtio feature negotiation

The upcoming virtio-net driver needs to negotiate some features,
so we need the possibility to do this in the core virtio code.

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


  Commit: 4bfd755ff35c00204c79577a1c4756d4d2310724
      
https://github.com/qemu/qemu/commit/4bfd755ff35c00204c79577a1c4756d4d2310724
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M roms/SLOF

  Log Message:
  -----------
  roms/SLOF: Update submodule to latest status

We need the latest fixes for building the libc and libnet
of SLOF for the s390-ccw network bootloader firmware.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 3e4415a751d2474052ac5e62e8c793d978ed080e
      
https://github.com/qemu/qemu/commit/3e4415a751d2474052ac5e62e8c793d978ed080e
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/Makefile
    A pc-bios/s390-ccw/netboot.mak
    A pc-bios/s390-ccw/netmain.c

  Log Message:
  -----------
  pc-bios/s390-ccw: Add core files for the network bootloading program

This is just a preparation for the next steps: Add a makefile and a
stripped down copy of pc-bios/s390-ccw/main.c as a basis for the network
bootloader program, linked against the libc from SLOF already (which we
will need for SLOF's libnet). The networking code is not included yet.

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


  Commit: 00dde1e60dd334b6a27b208132c9a57c36852ea1
      
https://github.com/qemu/qemu/commit/00dde1e60dd334b6a27b208132c9a57c36852ea1
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/netboot.mak
    A pc-bios/s390-ccw/virtio-net.c
    M pc-bios/s390-ccw/virtio.c
    M pc-bios/s390-ccw/virtio.h

  Log Message:
  -----------
  pc-bios/s390-ccw: Add virtio-net driver code

The driver provides the recv() and send() functions which will
be required by SLOF's libnet code for receiving and sending
packets.

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


  Commit: 29d12216dae487a35f54141c6a397a64ec86cfe8
      
https://github.com/qemu/qemu/commit/29d12216dae487a35f54141c6a397a64ec86cfe8
  Author: Thomas Huth <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M pc-bios/s390-ccw/netboot.mak
    M pc-bios/s390-ccw/netmain.c

  Log Message:
  -----------
  pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load

Most of the code has been taken from SLOF's netload.c file. Now we
can finally load an image via TFTP and execute the downloaded kernel.

Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Tested-by: Viktor Mihajlovski <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 6c5359e161b8e90e14940c0c72025dcfb8ce32f9
      
https://github.com/qemu/qemu/commit/6c5359e161b8e90e14940c0c72025dcfb8ce32f9
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M Makefile
    A pc-bios/s390-netboot.img

  Log Message:
  -----------
  pc-bios/s390: add s390-netboot.img

It's already possible to do a network boot of an s390x guest with an
external netboot image based on a Linux installation, but it would
be much more convenient if the s390-ccw firmware supported network
booting right out of the box, without the need to assemble such an
external image first.

This is an s390-netboot.img that can be used for network booting.
You can download a combined kernel + initrd image via TFTP
by starting QEMU for example with:

 qemu-system-s390x ... -device virtio-net,netdev=n1,bootindex=1 \
       -netdev user,id=n1,tftp=/path/to/tftp,bootfile=kernel.img

Note that this version does not support downloading via config
files (i.e. pxelinux config files or .INS config files) yet. This
will be added later.

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


  Commit: fb32d2385a4eded144f6e5ee4c439f7bb0e69e97
      
https://github.com/qemu/qemu/commit/fb32d2385a4eded144f6e5ee4c439f7bb0e69e97
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  pc-bios/s390: rebuild s390-ccw.img

rebuild after the following commits

4b996d0 pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP 
load
e6879a6 pc-bios/s390-ccw: Add virtio-net driver code
766500f pc-bios/s390-ccw: Add core files for the network bootloading program
f807e55 pc-bios/s390-ccw: Add code for virtio feature negotiation
b4e3b4f pc-bios/s390-ccw: Remove unused structs from virtio.h
dd3dc5e pc-bios/s390-ccw: Move byteswap functions to a separate header
a20b4fe pc-bios/s390-ccw: Add a write() function for stdio
262e07c pc-bios/s390-ccw: Move virtio-block related functions into a separate 
file
7438d32 pc-bios/s390-ccw: Move ebc2asc to sclp.c
8760bad pc-bios/s390-ccw: Move libc functions to separate header
c68f450 pc-bios/s390-ccw: use STRIP variable in Makefile

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


  Commit: 3720d3356d47aedf2f66b6586011661a7eeb0222
      
https://github.com/qemu/qemu/commit/3720d3356d47aedf2f66b6586011661a7eeb0222
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x: initialize cpu firstly

By initializing the CPU firstly, we are able to retrieve and use the
CPU model features when initializing other subsystem or devices.

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


  Commit: 3b00f702c236900cca403bdcbed48d59bfec0fba
      
https://github.com/qemu/qemu/commit/3b00f702c236900cca403bdcbed48d59bfec0fba
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M hw/s390x/s390-virtio-ccw.c
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features_def.h
    M target/s390x/gen-features.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/cpumodel: add zpci, aen and ais facilities

zPCI instructions and facilities are available since IBM zEnterprise
EC12. To support z/PCI in QEMU we enable zpci, aen and ais facilities
starting with zEC12 GA1. And we always set zpci and aen bits in max cpu
model. Later they might be switched off due to applied real cpu model.
For ais bit, we only provide it in the full cpu model beginning with
zEC12 and defer its enablement in the default cpu model to a later point
in time. At the same time, disable them for 2.9 and older machines.

Because of introducing AIS facility, we could check if it's enabled to
initialize flic->ais_supported with the real value.

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


  Commit: e7be8d499700f1ebdbfe8094aa19237998c0e1e3
      
https://github.com/qemu/qemu/commit/e7be8d499700f1ebdbfe8094aa19237998c0e1e3
  Author: Yi Min Zhao <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M include/hw/s390x/s390_flic.h

  Log Message:
  -----------
  s390x/flic: migrate ais states

During migration we should transfer ais states to the target guest.
This patch introduces a subsection to kvm_s390_flic_vmstate and new
vmsd for qemu_flic. The ais states need to be migrated only when
ais is supported.

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


  Commit: 6da5c593bb2c27cef5fbfc4b37342bbf66133cc1
      
https://github.com/qemu/qemu/commit/6da5c593bb2c27cef5fbfc4b37342bbf66133cc1
  Author: Jason J. Herne <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M include/hw/s390x/sclp.h
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features.h
    M target/s390x/cpu_features_def.h
    M target/s390x/cpu_models.c
    M target/s390x/gen-features.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/cpumodel: wire up new hardware features

Some new guest features have been introduced recently. Let's wire
them up in the CPU model.

Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
[split patch]


  Commit: 075e52b816648f21ca6bf5cc01624dff3993c99e
      
https://github.com/qemu/qemu/commit/075e52b816648f21ca6bf5cc01624dff3993c99e
  Author: Jason J. Herne <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M target/s390x/cpu_features.c
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/cpumodel: we are always in zarchitecture mode

In QEMU, a guest VCPU always started in and never was able to leave
z/Architecture mode. Now we have an architected way of showing this
condition.

The SIGP SET ARCHITECTURE instruction is simply rejected. Linux as guest
seems to not care about the return value, which is a good thing
The new handling is just like already being in z/Architecture mode.

We'll not try to fake absence of this facility, but still not indicate
the facility in case some strange CPU model turned z/Architecture off
completely (which doesn't work either way but let's us see how a
guest would react on a lack of this facility).

Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80
      
https://github.com/qemu/qemu/commit/7223bccea3654b6bd6e10f0fb6d0099f1a4b0e80
  Author: Jason J. Herne <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/cpumodel: add esop/esop2 to z12 model

Add esop and esop2 features to z12 model where esop2 was originally
introduced. Disable esop and esop2 when using compatibility machine
v2.9 or earlier.

Signed-off-by: Jason J. Herne <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: c0a9cd940e6bbad75cef3b5e87b826125702c353
      
https://github.com/qemu/qemu/commit/c0a9cd940e6bbad75cef3b5e87b826125702c353
  Author: Farhan Ali <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M target/s390x/kvm.c

  Log Message:
  -----------
  s390x/kvm: Enable KSS facility for nested virtualization

If the host supports keyless subset (KSS) then first level
guest (G2) should enable KSS facility as well.

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


  Commit: 62deb62d999cf9e2be61272c6b720104f764bd6a
      
https://github.com/qemu/qemu/commit/62deb62d999cf9e2be61272c6b720104f764bd6a
  Author: Fan Zhang <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

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

  Log Message:
  -----------
  s390x/kvm: enable guarded storage

Introduce guarded storage support for KVM guests on s390.
We need to enable the capability, extend machine check validity,
sigp store-additional-status-at-address, and migration.

The feature is fenced for older machine type versions.

Signed-off-by: Fan Zhang <address@hidden>
Reviewed-by: Cornelia Huck <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>


  Commit: 21a106904b5336b6ea60c22a95feb7d61c664d7f
      
https://github.com/qemu/qemu/commit/21a106904b5336b6ea60c22a95feb7d61c664d7f
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M include/elf.h
    M target/s390x/arch_dump.c

  Log Message:
  -----------
  s390x/arch_dump: also dump guarded storage control block

Write the new note section of type 30b (guarded storage control block).

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


  Commit: 86158a2a2b81f075c84d0b95c6d72b98dbf1dc61
      
https://github.com/qemu/qemu/commit/86158a2a2b81f075c84d0b95c6d72b98dbf1dc61
  Author: Christian Borntraeger <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M configure
    A gdb-xml/s390-gs.xml
    M target/s390x/gdbstub.c

  Log Message:
  -----------
  s390x/gdb: add gs registers

Let's provide the guarded storage registers via gdb server.

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


  Commit: fbc8ea1ed0704b0cd393e5dc429816a36cb5ed05
      
https://github.com/qemu/qemu/commit/fbc8ea1ed0704b0cd393e5dc429816a36cb5ed05
  Author: Peter Maydell <address@hidden>
  Date:   2017-07-14 (Fri, 14 Jul 2017)

  Changed paths:
    M Makefile
    M configure
    A gdb-xml/s390-gs.xml
    M hmp-commands-info.hx
    M hmp-commands.hx
    M hw/intc/s390_flic.c
    M hw/intc/s390_flic_kvm.c
    M hw/intc/trace-events
    M hw/s390x/Makefile.objs
    M hw/s390x/css-bridge.c
    M hw/s390x/css.c
    M hw/s390x/s390-pci-bus.c
    A hw/s390x/s390-stattrib-kvm.c
    A hw/s390x/s390-stattrib.c
    M hw/s390x/s390-virtio-ccw.c
    M hw/s390x/trace-events
    M hw/s390x/virtio-ccw.c
    M include/elf.h
    M include/hw/s390x/css.h
    M include/hw/s390x/s390-virtio-ccw.h
    M include/hw/s390x/s390_flic.h
    M include/hw/s390x/sclp.h
    A include/hw/s390x/storage-attributes.h
    M include/standard-headers/asm-x86/hyperv.h
    M include/standard-headers/linux/input-event-codes.h
    M include/standard-headers/linux/pci_regs.h
    M linux-headers/asm-arm/kvm.h
    M linux-headers/asm-arm64/kvm.h
    M linux-headers/asm-powerpc/kvm.h
    M linux-headers/asm-s390/kvm.h
    M linux-headers/linux/kvm.h
    M monitor.c
    M pc-bios/s390-ccw.img
    M pc-bios/s390-ccw/Makefile
    M pc-bios/s390-ccw/bootmap.c
    M pc-bios/s390-ccw/bootmap.h
    A pc-bios/s390-ccw/bswap.h
    A pc-bios/s390-ccw/libc.h
    M pc-bios/s390-ccw/main.c
    A pc-bios/s390-ccw/netboot.mak
    A pc-bios/s390-ccw/netmain.c
    M pc-bios/s390-ccw/s390-ccw.h
    M pc-bios/s390-ccw/sclp.c
    A pc-bios/s390-ccw/virtio-blkdev.c
    A pc-bios/s390-ccw/virtio-net.c
    M pc-bios/s390-ccw/virtio-scsi.c
    M pc-bios/s390-ccw/virtio.c
    M pc-bios/s390-ccw/virtio.h
    A pc-bios/s390-netboot.img
    M roms/SLOF
    M target/s390x/arch_dump.c
    M target/s390x/cpu.h
    M target/s390x/cpu_features.c
    M target/s390x/cpu_features.h
    M target/s390x/cpu_features_def.h
    M target/s390x/cpu_models.c
    M target/s390x/cpu_models.h
    M target/s390x/gdbstub.c
    M target/s390x/gen-features.c
    M target/s390x/kvm.c
    M target/s390x/machine.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170714' into 
staging

s390x/kvm/migration/cpumodel: fixes, enhancements and cleanups

- add a network boot rom for s390 (Thomas Huth)
- migration of storage attributes like the CMMA used/unused state
- PCI related enhancements - full support for aen, ais and zpci
- migration support for css with vmstates (Halil Pasic)
- cpu model enhancements for cpu features
- guarded storage support

# gpg: Signature made Fri 14 Jul 2017 11:33:04 BST
# gpg:                using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <address@hidden>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB  FBCA 117B BC80 B5A6 1C7C

* remotes/borntraeger/tags/s390x-20170714: (40 commits)
  s390x/gdb: add gs registers
  s390x/arch_dump: also dump guarded storage control block
  s390x/kvm: enable guarded storage
  s390x/kvm: Enable KSS facility for nested virtualization
  s390x/cpumodel: add esop/esop2 to z12 model
  s390x/cpumodel: we are always in zarchitecture mode
  s390x/cpumodel: wire up new hardware features
  s390x/flic: migrate ais states
  s390x/cpumodel: add zpci, aen and ais facilities
  s390x: initialize cpu firstly
  pc-bios/s390: rebuild s390-ccw.img
  pc-bios/s390: add s390-netboot.img
  pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load
  pc-bios/s390-ccw: Add virtio-net driver code
  pc-bios/s390-ccw: Add core files for the network bootloading program
  roms/SLOF: Update submodule to latest status
  pc-bios/s390-ccw: Add code for virtio feature negotiation
  pc-bios/s390-ccw: Remove unused structs from virtio.h
  pc-bios/s390-ccw: Move byteswap functions to a separate header
  pc-bios/s390-ccw: Add a write() function for stdio
  ...

Conflicts:
        target/s390x/kvm.c

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


Compare: https://github.com/qemu/qemu/compare/6c6076662d98...fbc8ea1ed070

reply via email to

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