[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/9] s390x: unify device reset during subsystem_rese
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH 5/9] s390x: unify device reset during subsystem_reset() |
Date: |
Wed, 14 Oct 2015 13:51:43 +0200 |
From: David Hildenbrand <address@hidden>
We have to manually reset several devices that are not on a bus: Let's
collect them in an array.
Reviewed-by: Cornelia Huck <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Signed-off-by: Cornelia Huck <address@hidden>
---
hw/s390x/s390-virtio-ccw.c | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index b9033d4..14b095f 100644
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -35,26 +35,23 @@ typedef struct S390CcwMachineState {
bool dea_key_wrap;
} S390CcwMachineState;
+const char const *reset_dev_types[] = {
+ "virtual-css-bridge",
+ "s390-sclp-event-facility",
+ "s390-flic",
+ "diag288",
+};
+
void subsystem_reset(void)
{
- DeviceState *css, *sclp, *flic, *diag288;
+ DeviceState *dev;
+ int i;
- css = DEVICE(object_resolve_path_type("", "virtual-css-bridge", NULL));
- if (css) {
- qdev_reset_all(css);
- }
- sclp = DEVICE(object_resolve_path_type("",
- "s390-sclp-event-facility", NULL));
- if (sclp) {
- qdev_reset_all(sclp);
- }
- flic = DEVICE(object_resolve_path_type("", "s390-flic", NULL));
- if (flic) {
- qdev_reset_all(flic);
- }
- diag288 = DEVICE(object_resolve_path_type("", "diag288", NULL));
- if (diag288) {
- qdev_reset_all(diag288);
+ for (i = 0; i < ARRAY_SIZE(reset_dev_types); i++) {
+ dev = DEVICE(object_resolve_path_type("", reset_dev_types[i], NULL));
+ if (dev) {
+ qdev_reset_all(dev);
+ }
}
}
--
2.6.1
- [Qemu-devel] [PATCH 0/9] Next set of s390x patches, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 4/9] s390x: flagify mcic values, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 9/9] s390x/cmma: clean up cmma reset, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 8/9] s390x: reset crypto only on clear reset and QEMU reset, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 1/9] util/qemu-config: fix missing machine command line options, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 3/9] s390x/kvm: Fix vector validity bit in device machine checks, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 7/9] s390x: machine reset function with new ipl cpu handling, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 2/9] s390x/virtio-ccw: fix 2.4 virtio compat, Cornelia Huck, 2015/10/14
- [Qemu-devel] [PATCH 5/9] s390x: unify device reset during subsystem_reset(),
Cornelia Huck <=
- [Qemu-devel] [PATCH 6/9] s390x/ipl: we always have an ipl device, Cornelia Huck, 2015/10/15