Commit e1fe27a2 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

Merge remote-tracking branch 'cohuck/tags/s390x-20170523' into staging 



s390x updates:
- support for vfio-ccw to passthrough channel devices
- allow ccw bios to boot from scsi generic devices
- bugfix for initial reset

# gpg: Signature made Tue 23 May 2017 12:02:24 PM BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* cohuck/tags/s390x-20170523: (21 commits)
  s390/kvm: do not reset riccb on initial cpu reset
  MAINTAINERS: Add vfio-ccw maintainer
  vfio/ccw: update sense data if a unit check is pending
  s390x/css: ccw translation infrastructure
  s390x/css: introduce and realize ccw-request callback
  vfio/ccw: get irqs info and set the eventfd fd
  vfio/ccw: get io region info
  vfio/ccw: vfio based subchannel passthrough driver
  s390x/css: device support for s390-ccw passthrough
  s390x/css: realize css_create_sch
  s390x/css: realize css_sch_build_schib
  s390x/css: add s390-squash-mcss machine option
  linux-headers: update
  pc-bios/s390-ccw.img: rebuild image
  pc-bios/s390-ccw: Build a reasonable max_sectors limit
  pc-bios/s390-ccw: Get Block Limits VPD device data
  pc-bios/s390-ccw: Get list of supported VPD pages
  pc-bios/s390-ccw: Refactor scsi_inquiry function
  pc-bios/s390-ccw: Break up virtio-scsi read into multiples
  pc-bios/s390-ccw: Move SCSI block factor to outer read
  ...

Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parents 9964e96d cb4f4bc3

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1005,6 +1005,14 @@ S: Supported 
F: hw/vfio/*

F: include/hw/vfio/



vfio-ccw

M: Cornelia Huck <cornelia.huck@de.ibm.com>

S: Supported

F: hw/vfio/ccw.c

F: hw/s390x/s390-ccw.c

F: include/hw/s390x/s390-ccw.h

T: git git://github.com/cohuck/qemu.git s390-next



vhost

M: Michael S. Tsirkin <mst@redhat.com>

S: Supported

default-configs/s390x-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -5,4 +5,5 @@ CONFIG_SCLPCONSOLE=y 
CONFIG_TERMINAL3270=y

CONFIG_S390_FLIC=y

CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)

CONFIG_VFIO_CCW=$(CONFIG_LINUX)

CONFIG_WDT_DIAG288=y

hw/s390x/3270-ccw.c

+5 −1
Original line number Diff line number Diff line
@@ -98,9 +98,13 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp) 
    EmulatedCcw3270Class *ck = EMULATED_CCW_3270_GET_CLASS(dev);

    CcwDevice *cdev = CCW_DEVICE(ds);

    CCWDeviceClass *cdk = CCW_DEVICE_GET_CLASS(cdev);

    SubchDev *sch = css_create_virtual_sch(cdev->devno, errp);

    DeviceState *parent = DEVICE(cdev);

    BusState *qbus = qdev_get_parent_bus(parent);

    VirtualCssBus *cbus = VIRTUAL_CSS_BUS(qbus);

    SubchDev *sch;

    Error *err = NULL;



    sch = css_create_sch(cdev->devno, true, cbus->squash_mcss, errp);

    if (!sch) {

        return;

    }

hw/s390x/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ obj-y += ccw-device.o 
obj-y += s390-pci-bus.o s390-pci-inst.o

obj-y += s390-skeys.o

obj-$(CONFIG_KVM) += s390-skeys-kvm.o

obj-y += s390-ccw.o

hw/s390x/css-bridge.c

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include "hw/s390x/css.h"

#include "ccw-device.h"

#include "hw/s390x/css-bridge.h"

#include "cpu.h"



/*

 * Invoke device-specific unplug handler, disable the subchannel
@@ -103,6 +104,7 @@ VirtualCssBus *virtual_css_bus_init(void) 
    /* Create bus on bridge device */

    bus = qbus_create(TYPE_VIRTUAL_CSS_BUS, dev, "virtual-css");

    cbus = VIRTUAL_CSS_BUS(bus);

    cbus->squash_mcss = s390_get_squash_mcss();



    /* Enable hotplugging */

    qbus_set_hotplug_handler(bus, dev, &error_abort);