Commit fbc8ea1e authored by Peter Maydell's avatar Peter Maydell
Browse files

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) <borntraeger@de.ibm.com>"
# 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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6c607666 86158a2a

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ efi-e1000e.rom efi-vmxnet3.rom \ 
qemu-icon.bmp qemu_logo_no_text.svg \

bamboo.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \

multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin \

s390-ccw.img \

s390-ccw.img s390-netboot.img \

spapr-rtas.bin slof.bin skiboot.lid \

palcode-clipper \

u-boot.e500 \

configure

+1 −1
Original line number Diff line number Diff line
@@ -6231,7 +6231,7 @@ case "$target_name" in 
    echo "TARGET_ABI32=y" >> $config_target_mak

  ;;

  s390x)

    gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml"

    gdb_xml_files="s390x-core64.xml s390-acr.xml s390-fpr.xml s390-vx.xml s390-cr.xml s390-virt.xml s390-gs.xml"

  ;;

  tilegx)

  ;;

gdb-xml/s390-gs.xml

0 → 100644
+14 −0
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!-- Copyright 2017 IBM Corp.



     This work is licensed under the terms of the GNU GPL, version 2 or

     (at your option) any later version. See the COPYING file in the

     top-level directory. -->



<!DOCTYPE feature SYSTEM "gdb-target.dtd">

<feature name="org.gnu.gdb.s390.gs">

  <reg name="gs_reserved" bitsize="64" type="uint64" group="system"/>

  <reg name="gsd" bitsize="64" type="uint64" group="system"/>

  <reg name="gssm" bitsize="64" type="uint64" group="system"/>

  <reg name="gsepla" bitsize="64" type="data_ptr" group="system"/>

</feature>

hmp-commands-info.hx

+16 −0
Original line number Diff line number Diff line
@@ -775,6 +775,22 @@ STEXI 
@item info skeys @var{address}

@findex skeys

Display the value of a storage key (s390 only)

ETEXI



#if defined(TARGET_S390X)

    {

        .name       = "cmma",

        .args_type  = "addr:l,count:l?",

        .params     = "address [count]",

        .help       = "Display the values of the CMMA storage attributes for a range of pages",

        .cmd        = hmp_info_cmma,

    },

#endif



STEXI

@item info cmma @var{address}

@findex cmma

Display the values of the CMMA storage attributes for a range of pages (s390 only)

ETEXI



    {

hmp-commands.hx

+16 −0
Original line number Diff line number Diff line
@@ -1151,6 +1151,22 @@ STEXI 
@item dump-skeys @var{filename}

@findex dump-skeys

Save guest storage keys to a file.

ETEXI



#if defined(TARGET_S390X)

    {

        .name       = "migration_mode",

        .args_type  = "mode:i",

        .params     = "mode",

        .help       = "Enables or disables migration mode\n",

        .cmd        = hmp_migrationmode,

    },

#endif



STEXI

@item migration_mode @var{mode}

@findex migration_mode

Enables or disables migration mode.

ETEXI



    {