aboutsummaryrefslogtreecommitdiff
path: root/target-s390x
diff options
context:
space:
mode:
authorDavid Hildenbrand <dahi@linux.vnet.ibm.com>2015-10-01 10:49:47 +0200
committerChristian Borntraeger <borntraeger@de.ibm.com>2015-10-02 13:31:52 +0200
commitd9f090ec7794d433b8f222ae8c8f95601369a4a5 (patch)
tree167ff1824b059e50f30ca07c88d8471dabcaefb6 /target-s390x
parenta6085fab3b6b9f0f9d636170b7d7bd31172b5038 (diff)
downloadqemu-d9f090ec7794d433b8f222ae8c8f95601369a4a5.zip
qemu-d9f090ec7794d433b8f222ae8c8f95601369a4a5.tar.gz
qemu-d9f090ec7794d433b8f222ae8c8f95601369a4a5.tar.bz2
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: 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>
Diffstat (limited to 'target-s390x')
-rw-r--r--target-s390x/cpu.h2
-rw-r--r--target-s390x/misc_helper.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h
index 5acd54c..843904b 100644
--- a/target-s390x/cpu.h
+++ b/target-s390x/cpu.h
@@ -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);
diff --git a/target-s390x/misc_helper.c b/target-s390x/misc_helper.c
index 8eac0e1..3a19e32 100644
--- a/target-s390x/misc_helper.c
+++ b/target-s390x/misc_helper.c
@@ -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();