[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/5] s390x: rename io_subsystem_reset -> subsystem_re
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 5/5] s390x: rename io_subsystem_reset -> subsystem_reset |
Date: |
Tue, 6 Oct 2015 12:41:05 +0200 |
From: David Hildenbrand <address@hidden>
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 <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Jens Freimann <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 2 +-
target-s390x/cpu.h | 2 +-
target-s390x/misc_helper.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index c53ebc1..6195f13 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 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();
--
2.4.3
- [Qemu-devel] [PULL 0/5] s390x: Fixes and features, Christian Borntraeger, 2015/10/08
- [Qemu-devel] [PULL 3/5] s390x: set missing parent for hotplug and quiesce events, Christian Borntraeger, 2015/10/08
- Re: [Qemu-devel] [PULL 0/5] s390x: Fixes and features, Peter Maydell, 2015/10/08
- [Qemu-devel] [PULL 2/5] s390x/gdb: expose virtualization specific registers, Christian Borntraeger, 2015/10/08
- [Qemu-devel] [PULL 4/5] s390x/info registers: print vector registers properly, Christian Borntraeger, 2015/10/08
- [Qemu-devel] [PULL 1/5] pc-bios/s390-ccw: avoid floating point operations, Christian Borntraeger, 2015/10/08
- [Qemu-devel] [PULL 5/5] s390x: rename io_subsystem_reset -> subsystem_reset,
Christian Borntraeger <=
- Re: [Qemu-devel] [PULL 0/5] s390x: Fixes and features, Christian Borntraeger, 2015/10/08