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

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



First pile of s390x patches for 2.4, including:
- some cleanup patches
- sort most of the s390x devices into categories
- support for the new STSI post handler, used to insert vm name and
  friends
- support for the new MEM_OP ioctl (including access register mode)
  for accessing guest memory

# gpg: Signature made Thu Apr 30 12:56:58 2015 BST 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-20150430:
  kvm: better advice for failed s390x startup
  s390x/kvm: Support access register mode for KVM_S390_MEM_OP ioctl
  s390x/mmu: Use ioctl for reading and writing from/to guest memory
  s390x/kvm: Put vm name, extended name and UUID into STSI322 SYSIB
  linux-headers: update
  s390x/mmu: Use access type definitions instead of magic values
  s390x/ipl: sort into categories
  sclp: sort into categories
  s390-virtio: sort into categories
  virtio-ccw: sort into categories

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 06feaacf 2c80e996

hw/char/sclpconsole-lm.c

+1 −0
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ static void console_class_init(ObjectClass *klass, void *data) 
    ec->can_handle_event = can_handle_event;

    ec->read_event_data = read_event_data;

    ec->write_event_data = write_event_data;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

}



static const TypeInfo sclp_console_info = {

hw/char/sclpconsole.c

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static void console_class_init(ObjectClass *klass, void *data) 
    ec->can_handle_event = can_handle_event;

    ec->read_event_data = read_event_data;

    ec->write_event_data = write_event_data;

    set_bit(DEVICE_CATEGORY_INPUT, dc->categories);

}



static const TypeInfo sclp_console_info = {

hw/s390x/event-facility.c

+1 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ static void init_event_facility_class(ObjectClass *klass, void *data) 


    dc->reset = reset_event_facility;

    dc->vmsd = &vmstate_event_facility;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    k->init = init_event_facility;

    k->command_handler = command_handler;

    k->event_pending = event_pending;

hw/s390x/ipl.c

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ static void s390_ipl_class_init(ObjectClass *klass, void *data) 
    dc->props = s390_ipl_properties;

    dc->reset = s390_ipl_reset;

    dc->vmsd = &vmstate_ipl;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

}



static const TypeInfo s390_ipl_info = {

hw/s390x/s390-pci-inst.c

+11 −10
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 
        return 0;

    }



    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], buffer, sizeof(*reqh))) {

    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], r2, buffer, sizeof(*reqh))) {

        return 0;

    }

    reqh = (ClpReqHdr *)buffer;
@@ -165,7 +165,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 
        return 0;

    }



    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], buffer,

    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], r2, buffer,

                               req_len + sizeof(*resh))) {

        return 0;

    }
@@ -180,7 +180,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 
        return 0;

    }



    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], buffer,

    if (s390_cpu_virt_mem_read(cpu, env->regs[r2], r2, buffer,

                               req_len + res_len)) {

        return 0;

    }
@@ -277,7 +277,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2) 
    }



out:

    if (s390_cpu_virt_mem_write(cpu, env->regs[r2], buffer,

    if (s390_cpu_virt_mem_write(cpu, env->regs[r2], r2, buffer,

                                req_len + res_len)) {

        return 0;

    }
@@ -546,7 +546,8 @@ out: 
    return 0;

}



int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr)

int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr,

                        uint8_t ar)

{

    CPUS390XState *env = &cpu->env;

    S390PCIBusDevice *pbdev;
@@ -603,7 +604,7 @@ int pcistb_service_call(S390CPU *cpu, uint8_t r1, uint8_t r3, uint64_t gaddr) 
        return 0;

    }



    if (s390_cpu_virt_mem_read(cpu, gaddr, buffer, len)) {

    if (s390_cpu_virt_mem_read(cpu, gaddr, ar, buffer, len)) {

        return 0;

    }
@@ -698,7 +699,7 @@ static void dereg_ioat(S390PCIBusDevice *pbdev) 
    pbdev->g_iota = 0;

}



int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba)

int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)

{

    CPUS390XState *env = &cpu->env;

    uint8_t oc;
@@ -727,7 +728,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba) 
        return 0;

    }



    if (s390_cpu_virt_mem_read(cpu, fiba, (uint8_t *)&fib, sizeof(fib))) {

    if (s390_cpu_virt_mem_read(cpu, fiba, ar, (uint8_t *)&fib, sizeof(fib))) {

        return 0;

    }
@@ -773,7 +774,7 @@ int mpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba) 
    return 0;

}



int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba)

int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba, uint8_t ar)

{

    CPUS390XState *env = &cpu->env;

    uint32_t fh;
@@ -829,7 +830,7 @@ int stpcifc_service_call(S390CPU *cpu, uint8_t r1, uint64_t fiba) 
        fib.fc |= 0x10;

    }



    if (s390_cpu_virt_mem_write(cpu, fiba, (uint8_t *)&fib, sizeof(fib))) {

    if (s390_cpu_virt_mem_write(cpu, fiba, ar, (uint8_t *)&fib, sizeof(fib))) {

        return 0;

    }