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

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



- fix confusion around sizes in storage attribute migration
- remove NULL check on error_propagate() in virtio-ccw

# gpg: Signature made Thu 12 Jul 2018 10:27:28 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-20180712:
  error: Remove NULL checks on error_propagate() calls
  s390x/storage attributes: fix CMMA_BLOCK_SIZE usage

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 87130a0d 78dcf512

hw/s390x/s390-stattrib-kvm.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ static void kvm_s390_stattrib_synchronize(S390StAttribState *sa) 
    KVMS390StAttribState *sas = KVM_S390_STATTRIB(sa);

    MachineState *machine = MACHINE(qdev_get_machine());

    unsigned long max = machine->maxram_size / TARGET_PAGE_SIZE;

    unsigned long cx, len = 1 << 19;

    /* We do not need to reach the maximum buffer size allowed */

    unsigned long cx, len = KVM_S390_SKEYS_MAX / 2;

    int r;

    struct kvm_s390_cmma_log clog = {

        .flags = 0,

hw/s390x/s390-stattrib.c

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ 
#include "qapi/error.h"

#include "qapi/qmp/qdict.h"



#define CMMA_BLOCK_SIZE  (1 * KiB)

/* 512KiB cover 2GB of guest memory */

#define CMMA_BLOCK_SIZE  (512 * KiB)



#define STATTR_FLAG_EOS     0x01ULL

#define STATTR_FLAG_MORE    0x02ULL
@@ -203,7 +204,7 @@ static int cmma_save(QEMUFile *f, void *opaque, int final) 
    S390StAttribClass *sac = S390_STATTRIB_GET_CLASS(sas);

    uint8_t *buf;

    int r, cx, reallen = 0, ret = 0;

    uint32_t buflen = 1 << 19;   /* 512kB cover 2GB of guest memory */

    uint32_t buflen = CMMA_BLOCK_SIZE;

    uint64_t start_gfn = sas->migration_cur_gfn;



    buf = g_try_malloc(buflen);

hw/s390x/virtio-ccw.c

+1 −3
Original line number Diff line number Diff line
@@ -1836,11 +1836,9 @@ static void vhost_vsock_ccw_realize(VirtioCcwDevice *ccw_dev, Error **errp) 
{

    VHostVSockCCWState *dev = VHOST_VSOCK_CCW(ccw_dev);

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

    Error *err = NULL;



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

    object_property_set_bool(OBJECT(vdev), true, "realized", &err);

    error_propagate(errp, err);

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

}



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