Commit d9f090ec authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

s390x: rename io_subsystem_reset -> subsystem_reset 



According to the Pop:
"Subsystem reset operates only on those elements in the configuration
which are not CPUs".

As this is what we actually do, let's simply rename the function.

Acked-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: default avatarJens Freimann <jfrei@linux.vnet.ibm.com>
Message-Id: <1443689387-34473-6-git-send-email-jfrei@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent a6085fab

hw/s390x/s390-virtio-ccw.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ typedef struct S390CcwMachineState { 
    bool dea_key_wrap;

} S390CcwMachineState;



void io_subsystem_reset(void)

void subsystem_reset(void)

{

    DeviceState *css, *sclp, *flic, *diag288;

target-s390x/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ void cpu_unlock(void); 
typedef struct SubchDev SubchDev;



#ifndef CONFIG_USER_ONLY

extern void io_subsystem_reset(void);

extern void subsystem_reset(void);

SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,

                         uint16_t schid);

bool css_subch_visible(SubchDev *sch);

target-s390x/misc_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static int modified_clear_reset(S390CPU *cpu) 
        run_on_cpu(t, s390_do_cpu_full_reset, t);

    }

    cmma_reset(cpu);

    io_subsystem_reset();

    subsystem_reset();

    scc->load_normal(CPU(cpu));

    cpu_synchronize_all_post_reset();

    resume_all_vcpus();
@@ -146,7 +146,7 @@ static int load_normal_reset(S390CPU *cpu) 
        run_on_cpu(t, s390_do_cpu_reset, t);

    }

    cmma_reset(cpu);

    io_subsystem_reset();

    subsystem_reset();

    scc->initial_cpu_reset(CPU(cpu));

    scc->load_normal(CPU(cpu));

    cpu_synchronize_all_post_reset();