Commit 2fde22f8 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



- various fixes and improvements in the tcg code
- split off the individual virtio-ccw devices into separate files

# gpg: Signature made Wed 29 Aug 2018 10:38:03 BST
# gpg:                using RSA key DECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <conny@cornelia-huck.de>"
# gpg:                 aka "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# gpg:                 aka "Cornelia Huck <cohuck@kernel.org>"
# gpg:                 aka "Cornelia Huck <cohuck@redhat.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20180829:
  target/s390x: use regular spaces in translate.c
  hw/s390x: Move virtio-ccw-blk code to a separate file
  hw/s390x: Move virtio-ccw-net code to a separate file
  hw/s390x: Move virtio-ccw-input code to a separate file
  hw/s390x: Move virtio-ccw-gpu code to a separate file
  hw/s390x: Move vhost-vsock-ccw code to a separate file
  hw/s390x: Move virtio-ccw-crypto code to a separate file
  hw/s390x: Move virtio-ccw-9p code to a separate file
  hw/s390x: Move virtio-ccw-rng code to a separate file
  hw/s390x: Move virtio-ccw-scsi code to a separate file
  hw/s390x: Move virtio-ccw-balloon code to a separate file
  hw/s390x: Move virtio-ccw-serial code to a separate file
  hw/s390x/virtio-ccw: Consolidate calls to virtio_ccw_unrealize()
  target/s390x: fix PACK reading 1 byte less and writing 1 byte more
  target/s390x: add EX support for TRT and TRTR
  target/s390x: fix IPM polluting irrelevant bits
  target/s390x: fix CSST decoding and runtime alignment check
  target/s390x: add BAL and BALR instructions
  tests/tcg: add a simple s390x test

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 850a8242 ef17064a

MAINTAINERS

+3 −1
Original line number Diff line number Diff line
@@ -253,6 +253,7 @@ S: Maintained 
F: target/s390x/

F: hw/s390x/

F: disas/s390.c

F: tests/tcg/s390x/

L: qemu-s390x@nongnu.org



SH4
@@ -1236,7 +1237,8 @@ virtio-ccw 
M: Cornelia Huck <cohuck@redhat.com>

M: Christian Borntraeger <borntraeger@de.ibm.com>

S: Supported

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

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

F: hw/s390x/vhost-vsock-ccw.c

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

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

L: qemu-s390x@nongnu.org

hw/s390x/Makefile.objs

+11 −0
Original line number Diff line number Diff line
@@ -8,6 +8,17 @@ obj-y += css.o 
obj-y += s390-virtio-ccw.o

obj-y += 3270-ccw.o

obj-y += virtio-ccw.o

obj-$(CONFIG_VIRTIO_SERIAL) += virtio-ccw-serial.o

obj-$(CONFIG_VIRTIO_BALLOON) += virtio-ccw-balloon.o

obj-$(CONFIG_VIRTIO_SCSI) += virtio-ccw-scsi.o

obj-$(CONFIG_VIRTIO_RNG) += virtio-ccw-rng.o

obj-$(CONFIG_VIRTIO_CRYPTO) += virtio-ccw-crypto.o

obj-$(CONFIG_VIRTIO_GPU) += virtio-ccw-gpu.o

obj-$(CONFIG_VIRTIO_INPUT) += virtio-ccw-input.o

obj-$(CONFIG_VIRTIO_NET) += virtio-ccw-net.o

obj-$(CONFIG_VIRTIO_BLK) += virtio-ccw-blk.o

obj-$(call land,$(CONFIG_VIRTIO_9P),$(CONFIG_VIRTFS)) += virtio-ccw-9p.o

obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-ccw.o

obj-y += css-bridge.o

obj-y += ccw-device.o

obj-$(CONFIG_PCI) += s390-pci-bus.o s390-pci-inst.o

hw/s390x/vhost-vsock-ccw.c

0 → 100644
+60 −0
Original line number Diff line number Diff line 
/*

 * vhost vsock ccw implementation

 *

 * 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.

 */



#include "qemu/osdep.h"

#include "hw/virtio/virtio.h"

#include "qapi/error.h"

#include "virtio-ccw.h"



static Property vhost_vsock_ccw_properties[] = {

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void vhost_vsock_ccw_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = vhost_vsock_ccw_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = vhost_vsock_ccw_properties;

}



static void vhost_vsock_ccw_instance_init(Object *obj)

{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VHOST_VSOCK);

}



static const TypeInfo vhost_vsock_ccw_info = {

    .name          = TYPE_VHOST_VSOCK_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VHostVSockCCWState),

    .instance_init = vhost_vsock_ccw_instance_init,

    .class_init    = vhost_vsock_ccw_class_init,

};



static void vhost_vsock_ccw_register(void)

{

    type_register_static(&vhost_vsock_ccw_info);

}



type_init(vhost_vsock_ccw_register)

hw/s390x/virtio-ccw-9p.c

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

 * virtio ccw 9p implementation

 *

 * Copyright 2012, 2015 IBM Corp.

 * Author(s): Pierre Morel <pmorel@linux.vnet.ibm.com>

 *

 * 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.

 */



#include "qemu/osdep.h"

#include "hw/virtio/virtio.h"

#include "qapi/error.h"

#include "virtio-ccw.h"



static void virtio_ccw_9p_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    V9fsCCWState *dev = VIRTIO_9P_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void virtio_ccw_9p_instance_init(Object *obj)

{

    V9fsCCWState *dev = VIRTIO_9P_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_9P);

}



static Property virtio_ccw_9p_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

            VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_ccw_9p_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_9p_realize;

    dc->props = virtio_ccw_9p_properties;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

}



static const TypeInfo virtio_ccw_9p_info = {

    .name          = TYPE_VIRTIO_9P_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(V9fsCCWState),

    .instance_init = virtio_ccw_9p_instance_init,

    .class_init    = virtio_ccw_9p_class_init,

};



static void virtio_ccw_9p_register(void)

{

    type_register_static(&virtio_ccw_9p_info);

}



type_init(virtio_ccw_9p_register)

hw/s390x/virtio-ccw-balloon.c

0 → 100644
+70 −0
Original line number Diff line number Diff line 
/*

 * virtio ccw balloon implementation

 *

 * Copyright 2012, 2015 IBM Corp.

 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>

 *

 * 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.

 */



#include "qemu/osdep.h"

#include "hw/virtio/virtio.h"

#include "qapi/error.h"

#include "virtio-ccw.h"



static void virtio_ccw_balloon_realize(VirtioCcwDevice *ccw_dev, Error **errp)

{

    VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(ccw_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static void virtio_ccw_balloon_instance_init(Object *obj)

{

    VirtIOBalloonCcw *dev = VIRTIO_BALLOON_CCW(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_BALLOON);

    object_property_add_alias(obj, "guest-stats", OBJECT(&dev->vdev),

                              "guest-stats", &error_abort);

    object_property_add_alias(obj, "guest-stats-polling-interval",

                              OBJECT(&dev->vdev),

                              "guest-stats-polling-interval", &error_abort);

}



static Property virtio_ccw_balloon_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtioCcwDevice, flags,

                    VIRTIO_CCW_FLAG_USE_IOEVENTFD_BIT, true),

    DEFINE_PROP_UINT32("max_revision", VirtioCcwDevice, max_rev,

                       VIRTIO_CCW_MAX_REV),

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_ccw_balloon_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass);



    k->realize = virtio_ccw_balloon_realize;

    dc->props = virtio_ccw_balloon_properties;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

}



static const TypeInfo virtio_ccw_balloon = {

    .name          = TYPE_VIRTIO_BALLOON_CCW,

    .parent        = TYPE_VIRTIO_CCW_DEVICE,

    .instance_size = sizeof(VirtIOBalloonCcw),

    .instance_init = virtio_ccw_balloon_instance_init,

    .class_init    = virtio_ccw_balloon_class_init,

};



static void virtio_ccw_balloon_register(void)

{

    type_register_static(&virtio_ccw_balloon);

}



type_init(virtio_ccw_balloon_register)