mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390x: rename io_subsystem_reset -> subsystem_reset

Browse Source 
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: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Message-Id: <1443689387-34473-6-git-send-email-jfrei@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
This commit is contained in:
David Hildenbrand 2015-10-01 10:49:47 +02:00 committed by Christian Borntraeger
parent a6085fab3b
commit d9f090ec77
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/s390x/s390-virtio-ccw.c
View File

@ -35,7 +35,7 @@ typedef struct S390CcwMachineState {
bool dea_key_wrap; bool dea_key_wrap;
} S390CcwMachineState; } S390CcwMachineState;
void io_subsystem_reset(void) void subsystem_reset(void)
{ {
DeviceState *css, *sclp, *flic, *diag288; DeviceState *css, *sclp, *flic, *diag288;

2
target-s390x/cpu.h
View File

@ -568,7 +568,7 @@ void cpu_unlock(void);
typedef struct SubchDev SubchDev; typedef struct SubchDev SubchDev;
#ifndef CONFIG_USER_ONLY #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, SubchDev *css_find_subch(uint8_t m, uint8_t cssid, uint8_t ssid,
uint16_t schid); uint16_t schid);
bool css_subch_visible(SubchDev *sch); bool css_subch_visible(SubchDev *sch);

4
target-s390x/misc_helper.c
View File

@ -128,7 +128,7 @@ static int modified_clear_reset(S390CPU *cpu)
run_on_cpu(t, s390_do_cpu_full_reset, t); run_on_cpu(t, s390_do_cpu_full_reset, t);
} }
cmma_reset(cpu); cmma_reset(cpu);
io_subsystem_reset(); subsystem_reset();
scc->load_normal(CPU(cpu)); scc->load_normal(CPU(cpu));
cpu_synchronize_all_post_reset(); cpu_synchronize_all_post_reset();
resume_all_vcpus(); resume_all_vcpus();
@ -146,7 +146,7 @@ static int load_normal_reset(S390CPU *cpu)
run_on_cpu(t, s390_do_cpu_reset, t); run_on_cpu(t, s390_do_cpu_reset, t);
} }
cmma_reset(cpu); cmma_reset(cpu);
io_subsystem_reset(); subsystem_reset();
scc->initial_cpu_reset(CPU(cpu)); scc->initial_cpu_reset(CPU(cpu));
scc->load_normal(CPU(cpu)); scc->load_normal(CPU(cpu));
cpu_synchronize_all_post_reset(); cpu_synchronize_all_post_reset();