From: David Hildenbrand Date: Thu, 1 Oct 2015 08:49:47 +0000 (+0200) Subject: s390x: rename io_subsystem_reset -> subsystem_reset X-Git-Tag: v2.5.0-rc0~86^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9f090ec7794d433b8f222ae8c8f95601369a4a5;p=thirdparty%2Fqemu.git 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 Signed-off-by: David Hildenbrand Signed-off-by: Jens Freimann Message-Id: <1443689387-34473-6-git-send-email-jfrei@linux.vnet.ibm.com> Signed-off-by: Christian Borntraeger --- diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index c53ebc1ae19..6195f132fc8 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -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; diff --git a/target-s390x/cpu.h b/target-s390x/cpu.h index 5acd54c6ca3..843904bc122 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 8eac0e12b99..3a19e321c8e 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();