Commit 357e81c7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



Mostly bugfixes and small improvements; and the gdb target.xml
patch.

# gpg: Signature made Thu 28 Jan 2016 11:02:14 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-20160128:
  s390x: s390_cpu_get_phys_page_debug has to return -1
  gdb: provide the name of the architecture in the target.xml
  s390x/css: fix control flags during csch
  watchdog/diag288: don't reset for action=none|debug|pause
  watchdog: introduction of get_watchdog_action
  s390x: fix generation of event information crw
  s390x/ioinst: set type and len for SEI response
  s390x/sclp: add device to the sysbus in sclp_realize
  s390x/machine: make addon register fields static
  s390x/skeys: Fix instance and class size

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8fd9dece 234779a2

gdbstub.c

+14 −7
Original line number Diff line number Diff line
@@ -540,13 +540,20 @@ static const char *get_feature_xml(const char *p, const char **newp, 
            GDBRegisterState *r;

            CPUState *cpu = first_cpu;



            snprintf(target_xml, sizeof(target_xml),

            pstrcat(target_xml, sizeof(target_xml),

                    "<?xml version=\"1.0\"?>"

                    "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">"

                     "<target>"

                     "<xi:include href=\"%s\"/>",

                     cc->gdb_core_xml_file);



                    "<target>");

            if (cc->gdb_arch_name) {

                gchar *arch = cc->gdb_arch_name(cpu);

                pstrcat(target_xml, sizeof(target_xml), "<architecture>");

                pstrcat(target_xml, sizeof(target_xml), arch);

                pstrcat(target_xml, sizeof(target_xml), "</architecture>");

                g_free(arch);

            }

            pstrcat(target_xml, sizeof(target_xml), "<xi:include href=\"");

            pstrcat(target_xml, sizeof(target_xml), cc->gdb_core_xml_file);

            pstrcat(target_xml, sizeof(target_xml), "\"/>");

            for (r = cpu->gdb_regs; r; r = r->next) {

                pstrcat(target_xml, sizeof(target_xml), "<xi:include href=\"");

                pstrcat(target_xml, sizeof(target_xml), r->xml);

hw/s390x/css.c

+13 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ typedef struct IoAdapter { 


typedef struct ChannelSubSys {

    QTAILQ_HEAD(, CrwContainer) pending_crws;

    bool sei_pending;

    bool do_crw_mchk;

    bool crws_lost;

    uint8_t max_cssid;
@@ -701,7 +702,7 @@ int css_do_csch(SubchDev *sch) 


    /* Trigger the clear function. */

    s->ctrl &= ~(SCSW_CTRL_MASK_FCTL | SCSW_CTRL_MASK_ACTL);

    s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_CLEAR_FUNC;

    s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND;



    do_subchannel_work(sch, NULL);

    ret = 0;
@@ -1359,8 +1360,16 @@ void css_generate_chp_crws(uint8_t cssid, uint8_t chpid) 


void css_generate_css_crws(uint8_t cssid)

{

    if (!channel_subsys->sei_pending) {

        css_queue_crw(CRW_RSC_CSS, 0, 0, cssid);

    }

    channel_subsys->sei_pending = true;

}



void css_clear_sei_pending(void)

{

    channel_subsys->sei_pending = false;

}



int css_enable_mcsse(void)

{
@@ -1509,6 +1518,7 @@ static void css_init(void) 
{

    channel_subsys = g_malloc0(sizeof(*channel_subsys));

    QTAILQ_INIT(&channel_subsys->pending_crws);

    channel_subsys->sei_pending = false;

    channel_subsys->do_crw_mchk = true;

    channel_subsys->crws_lost = false;

    channel_subsys->chnmon_active = false;
@@ -1561,6 +1571,7 @@ void css_reset(void) 
        QTAILQ_REMOVE(&channel_subsys->pending_crws, crw_cont, sibling);

        g_free(crw_cont);

    }

    channel_subsys->sei_pending = false;

    channel_subsys->do_crw_mchk = true;

    channel_subsys->crws_lost = false;

hw/s390x/css.h

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void css_generate_sch_crws(uint8_t cssid, uint8_t ssid, uint16_t schid, 
                           int hotplugged, int add);

void css_generate_chp_crws(uint8_t cssid, uint8_t chpid);

void css_generate_css_crws(uint8_t cssid);

void css_clear_sei_pending(void);

void css_adapter_interrupt(uint8_t isc);



#define CSS_IO_ADAPTER_VIRTIO 1

hw/s390x/s390-skeys.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static const TypeInfo qemu_s390_skeys_info = { 
    .instance_init = qemu_s390_skeys_init,

    .instance_size = sizeof(QEMUS390SKeysState),

    .class_init    = qemu_s390_skeys_class_init,

    .instance_size = sizeof(S390SKeysClass),

    .class_size    = sizeof(S390SKeysClass),

};



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

hw/s390x/sclp.c

+6 −2
Original line number Diff line number Diff line
@@ -465,6 +465,12 @@ static void sclp_realize(DeviceState *dev, Error **errp) 
    if (err) {

        goto out;

    }

    /*

     * qdev_device_add searches the sysbus for TYPE_SCLP_EVENTS_BUS. As long

     * as we can't find a fitting bus via the qom tree, we have to add the

     * event facility to the sysbus, so e.g. a sclp console can be created.

     */

    qdev_set_parent_bus(DEVICE(sclp->event_facility), sysbus_get_default());



    ret = s390_set_memory_limit(machine->maxram_size, &hw_limit);

    if (ret == -E2BIG) {
@@ -533,8 +539,6 @@ static void sclp_init(Object *obj) 


    new = object_new(TYPE_SCLP_EVENT_FACILITY);

    object_property_add_child(obj, TYPE_SCLP_EVENT_FACILITY, new, NULL);

    /* qdev_device_add searches the sysbus for TYPE_SCLP_EVENTS_BUS */

    qdev_set_parent_bus(DEVICE(new), sysbus_get_default());

    object_unref(new);

    sclp->event_facility = EVENT_FACILITY(new);