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

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



First (big) chunk of s390x updates:
- cpumodel support for s390x
- various fixes and improvements

# gpg: Signature made Tue 06 Sep 2016 16:09:53 BST
# gpg:                using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg:                 aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0  18CE DECF 6B93 C6F0 2FAF

* remotes/cohuck/tags/s390x-20160906-v2: (38 commits)
  s390x/cpumodel: implement QMP interface "query-cpu-model-baseline"
  s390x/cpumodel: implement QMP interface "query-cpu-model-comparison"
  s390x/cpumodel: implement QMP interface "query-cpu-model-expansion"
  qmp: add QMP interface "query-cpu-model-baseline"
  qmp: add QMP interface "query-cpu-model-comparison"
  qmp: add QMP interface "query-cpu-model-expansion"
  s390x/kvm: don't enable key wrapping if msa3 is disabled
  s390x/kvm: let the CPU model control CMM(A)
  s390x/kvm: disable host model for problematic compat machines
  s390x/kvm: implement CPU model support
  s390x/kvm: allow runtime-instrumentation for "none" machine
  s390x/sclp: propagate hmfai
  s390x/sclp: propagate the mha via sclp
  s390x/sclp: propagate the ibc val (lowest and unblocked ibc)
  s390x/sclp: indicate sclp features
  s390x/sclp: introduce sclp feature blocks
  s390x/sclp: factor out preparation of cpu entries
  s390x/cpumodel: check and apply the CPU model
  s390x/cpumodel: let the CPU model handle feature checks
  s390x/cpumodel: expose features and feature groups as properties
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 085c9150 f1a47d08

Makefile.target

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool 
qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx $(SRC_PATH)/scripts/hxtool

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



clean:

clean: clean-target

	rm -f *.a *~ $(PROGS)

	rm -f $(shell find . -name '*.[od]')

	rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c

hw/intc/s390_flic_kvm.c

+23 −19
Original line number Diff line number Diff line
@@ -280,12 +280,13 @@ static void kvm_s390_release_adapter_routes(S390FLICState *fs, 
 * kvm_flic_save - Save pending floating interrupts

 * @f: QEMUFile containing migration state

 * @opaque: pointer to flic device state

 * @size: ignored

 *

 * Note: Pass buf and len to kernel. Start with one page and

 * increase until buffer is sufficient or maxium size is

 * reached

 */

static void kvm_flic_save(QEMUFile *f, void *opaque)

static void kvm_flic_save(QEMUFile *f, void *opaque, size_t size)

{

    KVMS390FLICState *flic = opaque;

    int len = FLIC_SAVE_INITIAL_SIZE;
@@ -324,24 +325,19 @@ static void kvm_flic_save(QEMUFile *f, void *opaque) 
 * kvm_flic_load - Load pending floating interrupts

 * @f: QEMUFile containing migration state

 * @opaque: pointer to flic device state

 * @version_id: version id for migration

 * @size: ignored

 *

 * Returns: value of flic_enqueue_irqs, -EINVAL on error

 * Note: Do nothing when no interrupts where stored

 * in QEMUFile

 */

static int kvm_flic_load(QEMUFile *f, void *opaque, int version_id)

static int kvm_flic_load(QEMUFile *f, void *opaque, size_t size)

{

    uint64_t len = 0;

    uint64_t count = 0;

    void *buf = NULL;

    int r = 0;



    if (version_id != FLIC_SAVEVM_VERSION) {

        r = -EINVAL;

        goto out;

    }



    flic_enable_pfault((struct KVMS390FLICState *) opaque);



    count = qemu_get_be64(f);
@@ -372,6 +368,24 @@ out: 
    return r;

}



static const VMStateDescription kvm_s390_flic_vmstate = {

    .name = "s390-flic",

    .version_id = FLIC_SAVEVM_VERSION,

    .minimum_version_id = FLIC_SAVEVM_VERSION,

    .fields = (VMStateField[]) {

        {

            .name = "irqs",

            .info = &(const VMStateInfo) {

                .name = "irqs",

                .get = kvm_flic_load,

                .put = kvm_flic_save,

            },

            .flags = VMS_SINGLE,

        },

        VMSTATE_END_OF_LIST()

    }

};



static void kvm_s390_flic_realize(DeviceState *dev, Error **errp)

{

    KVMS390FLICState *flic_state = KVM_S390_FLIC(dev);
@@ -398,16 +412,6 @@ static void kvm_s390_flic_realize(DeviceState *dev, Error **errp) 
    flic_state->clear_io_supported = !ioctl(flic_state->fd,

                                            KVM_HAS_DEVICE_ATTR, test_attr);



    /* Register savevm handler for floating interrupts */

    register_savevm(NULL, "s390-flic", 0, 1, kvm_flic_save,

                    kvm_flic_load, (void *) flic_state);

}



static void kvm_s390_flic_unrealize(DeviceState *dev, Error **errp)

{

    KVMS390FLICState *flic_state = KVM_S390_FLIC(dev);



    unregister_savevm(DEVICE(flic_state), "s390-flic", flic_state);

}



static void kvm_s390_flic_reset(DeviceState *dev)
@@ -438,7 +442,7 @@ static void kvm_s390_flic_class_init(ObjectClass *oc, void *data) 
    S390FLICStateClass *fsc = S390_FLIC_COMMON_CLASS(oc);



    dc->realize = kvm_s390_flic_realize;

    dc->unrealize = kvm_s390_flic_unrealize;

    dc->vmsd = &kvm_s390_flic_vmstate;

    dc->reset = kvm_s390_flic_reset;

    fsc->register_io_adapter = kvm_s390_register_io_adapter;

    fsc->io_adapter_map = kvm_s390_io_adapter_map;

hw/s390x/css.c

+3 −5
Original line number Diff line number Diff line
@@ -141,7 +141,8 @@ out_err: 
int css_create_css_image(uint8_t cssid, bool default_image)

{

    trace_css_new_image(cssid, default_image ? "(default)" : "");

    if (cssid > MAX_CSSID) {

    /* 255 is reserved */

    if (cssid == 255) {

        return -EINVAL;

    }

    if (channel_subsys.css[cssid]) {
@@ -1267,7 +1268,7 @@ bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid) 
    uint8_t real_cssid;



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

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

    if (ssid > MAX_SSID ||

        !channel_subsys.css[real_cssid] ||

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

        return true;
@@ -1282,9 +1283,6 @@ static int css_add_virtual_chpid(uint8_t cssid, uint8_t chpid, uint8_t type) 
    CssImage *css;



    trace_css_chpid_add(cssid, chpid, type);

    if (cssid > MAX_CSSID) {

        return -EINVAL;

    }

    css = channel_subsys.css[cssid];

    if (!css) {

        return -EINVAL;

hw/s390x/s390-pci-bus.c

+2 −5
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ static void s390_pcihost_hot_plug(HotplugHandler *hotplug_dev, 
            pbdev = s390_pci_device_new(dev->id);

            if (!pbdev) {

                error_setg(errp, "create zpci device failed");

                return;

            }

        }
@@ -717,11 +718,7 @@ static void s390_pcihost_hot_unplug(HotplugHandler *hotplug_dev, 
                break;

            }

        }



        if (!pbdev) {

            object_unparent(OBJECT(pci_dev));

            return;

        }

        assert(pbdev != NULL);

    } else if (object_dynamic_cast(OBJECT(dev), TYPE_S390_PCI_DEVICE)) {

        pbdev = S390_PCI_DEVICE(dev);

        pci_dev = pbdev->pdev;

hw/s390x/s390-virtio-ccw.c

+22 −1
Original line number Diff line number Diff line
@@ -249,6 +249,11 @@ bool ri_allowed(void) 


            return s390mc->ri_allowed;

        }

        /*

         * Make sure the "none" machine can have ri, otherwise it won't * be

         * unlocked in KVM and therefore the host CPU model might be wrong.

         */

        return true;

    }

    return 0;

}
@@ -316,7 +321,11 @@ static const TypeInfo ccw_machine_info = { 
    }                                                                         \

    type_init(ccw_machine_register_##suffix)



#define CCW_COMPAT_2_7 \

        HW_COMPAT_2_7



#define CCW_COMPAT_2_6 \

        CCW_COMPAT_2_7 \

        HW_COMPAT_2_6 \

        {\

            .driver   = TYPE_S390_IPL,\
@@ -372,14 +381,26 @@ static const TypeInfo ccw_machine_info = { 
            .value    = "0",\

        },



static void ccw_machine_2_8_instance_options(MachineState *machine)

{

}



static void ccw_machine_2_8_class_options(MachineClass *mc)

{

}

DEFINE_CCW_MACHINE(2_8, "2.8", true);



static void ccw_machine_2_7_instance_options(MachineState *machine)

{

    ccw_machine_2_8_instance_options(machine);

}



static void ccw_machine_2_7_class_options(MachineClass *mc)

{

    ccw_machine_2_8_class_options(mc);

    SET_MACHINE_COMPAT(mc, CCW_COMPAT_2_7);

}

DEFINE_CCW_MACHINE(2_7, "2.7", true);

DEFINE_CCW_MACHINE(2_7, "2.7", false);



static void ccw_machine_2_6_instance_options(MachineState *machine)

{