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

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



Final batch of s390x enhancements/fixes for 2.3:
- handle TOD clock during migration
- CPACF key wrap options
- limit amount of pci device code we build
- ensure big endian accesses for ccws
- various fixes and cleanups

# gpg: Signature made Mon Mar 16 10:01:44 2015 GMT using RSA key ID C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"

* remotes/cohuck/tags/s390x-20150316:
  s390x/config: Do not include full pci.mak
  s390x/pci: fix length in sei_nt2 event
  s390x/ipl: remove dead code
  s390x/virtio-bus: Remove unused function s390_virtio_bus_console()
  s390x: CPACF: Handle key wrap machine options
  s390x/kvm: make use of generic vm attribute check
  kvm: encapsulate HAS_DEVICE for vm attrs
  virtio-ccw: assure BE accesses
  s390x/kvm: Guest Migration TOD clock synchronization
  s390x: Replace unchecked qdev_init() by qdev_init_nofail()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f421f057 be0b608a

default-configs/s390x-softmmu.mak

+2 −1
Original line number Diff line number Diff line 
include pci.mak

CONFIG_PCI=y

CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO=y

CONFIG_SCLPCONSOLE=y

CONFIG_S390_FLIC=y

hw/intc/s390_flic.c

+1 −5
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ S390FLICState *s390_get_flic(void) 
void s390_flic_init(void)

{

    DeviceState *dev;

    int r;



    dev = s390_flic_kvm_create();

    if (!dev) {
@@ -38,10 +37,7 @@ void s390_flic_init(void) 
        object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,

                                  OBJECT(dev), NULL);

    }

    r = qdev_init(dev);

    if (r) {

        error_report("flic: couldn't create qdev");

    }

    qdev_init_nofail(dev);

}



static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,

hw/s390x/ipl.c

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static int s390_ipl_init(SysBusDevice *dev) 
            bios_size = load_image_targphys(bios_filename, ZIPL_IMAGE_START,

                                            4096);

            ipl->bios_start_addr = ZIPL_IMAGE_START;

            if (bios_size > 4096) {

                hw_error("stage1 bootloader is > 4k\n");

            }

        }

        g_free(bios_filename);

hw/s390x/s390-pci-bus.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ int chsc_sei_nt2_get_event(void *res) 
        QTAILQ_REMOVE(&s->pending_sei, sei_cont, link);

        nt2_res->nt = 2;

        nt2_res->cc = sei_cont->cc;

        nt2_res->length = cpu_to_be16(sizeof(ChscSeiNt2Res));

        switch (sei_cont->cc) {

        case 1: /* error event */

            eccdf = (PciCcdfErr *)nt2_res->ccdf;

hw/s390x/s390-virtio-bus.c

+0 −5
Original line number Diff line number Diff line
@@ -435,11 +435,6 @@ void s390_virtio_device_update_status(VirtIOS390Device *dev) 
    virtio_set_features(vdev, features);

}



VirtIOS390Device *s390_virtio_bus_console(VirtIOS390Bus *bus)

{

    return bus->console;

}



/* Find a device by vring address */

VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus,

                                             ram_addr_t mem,