Commit eb839909 authored by Blue Swirl's avatar Blue Swirl
Browse files

Merge branch 's390-for-upstream' of git://github.com/agraf/qemu 

* 's390-for-upstream' of git://github.com/agraf/qemu:
  s390/virtio-ccw: remove redundant call to blockdev_mark_auto_del
  s390/css: Fix subchannel detection
  Allow virtio-net features for legacy s390 virtio bus
  s390: virtio-ccw maintainer
  s390: simplify kvm cpu init
parents 62e1aeae 8a7df84f

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -454,6 +454,14 @@ M: Alexander Graf <agraf@suse.de> 
S: Maintained

F: hw/s390-*.c



S390 Virtio-ccw

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

M: Alexander Graf <agraf@suse.de>

S: Supported

F: hw/s390x/s390-virtio-ccw.c

F: hw/s390x/css.[hc]

T: git git://github.com/cohuck/qemu virtio-ccw-upstr



UniCore32 Machines

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

PKUnity-3 SoC initramfs-with-busybox
@@ -565,6 +573,12 @@ M: Stefan Hajnoczi <stefanha@redhat.com> 
S: Supported

F: hw/virtio-blk*



virtio-ccw

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

S: Supported

F: hw/s390x/virtio-ccw.[hc]

T: git git://github.com/cohuck/qemu virtio-ccw-upstr



virtio-serial

M: Amit Shah <amit.shah@redhat.com>

S: Supported

hw/s390x/css.c

+7 −4
Original line number Diff line number Diff line
@@ -988,15 +988,18 @@ int css_do_rchp(uint8_t cssid, uint8_t chpid) 
    return 0;

}



bool css_schid_final(uint8_t cssid, uint8_t ssid, uint16_t schid)

bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid)

{

    SubchSet *set;

    uint8_t real_cssid;



    if (cssid > MAX_CSSID || ssid > MAX_SSID || !channel_subsys->css[cssid] ||

        !channel_subsys->css[cssid]->sch_set[ssid]) {

    real_cssid = (!m && (cssid == 0)) ? channel_subsys->default_cssid : cssid;

    if (real_cssid > MAX_CSSID || ssid > MAX_SSID ||

        !channel_subsys->css[real_cssid] ||

        !channel_subsys->css[real_cssid]->sch_set[ssid]) {

        return true;

    }

    set = channel_subsys->css[cssid]->sch_set[ssid];

    set = channel_subsys->css[real_cssid]->sch_set[ssid];

    return schid > find_last_bit(set->schids_used,

                                 (MAX_SCHID + 1) / sizeof(unsigned long));

}

hw/s390x/s390-virtio-bus.c

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ static const VirtIOBindings virtio_s390_bindings = { 


static Property s390_virtio_net_properties[] = {

    DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic),

    DEFINE_VIRTIO_NET_FEATURES(VirtIOS390Device, host_features),

    DEFINE_PROP_UINT32("x-txtimer", VirtIOS390Device,

                       net.txtimer, TX_TIMER_INTERVAL),

    DEFINE_PROP_INT32("x-txburst", VirtIOS390Device,

hw/s390x/virtio-ccw.c

+0 −1
Original line number Diff line number Diff line
@@ -585,7 +585,6 @@ static int virtio_ccw_blk_init(VirtioCcwDevice *dev) 
static int virtio_ccw_blk_exit(VirtioCcwDevice *dev)

{

    virtio_blk_exit(dev->vdev);

    blockdev_mark_auto_del(dev->blk.conf.bs);

    return virtio_ccw_exit(dev);

}

target-s390x/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid, 
bool css_subch_visible(SubchDev *sch);

void css_conditional_io_interrupt(SubchDev *sch);

int css_do_stsch(SubchDev *sch, SCHIB *schib);

bool css_schid_final(uint8_t cssid, uint8_t ssid, uint16_t schid);

bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid);

int css_do_msch(SubchDev *sch, SCHIB *schib);

int css_do_xsch(SubchDev *sch);

int css_do_csch(SubchDev *sch);