[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 7/7] s390x/css: use SubchDev.orb
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v2 7/7] s390x/css: use SubchDev.orb |
Date: |
Mon, 29 May 2017 15:55:20 +0200 |
Instead of passing around a pointer to ORB let us simplify some
functions signatures by using the previously introduced ORB saved at the
subchannel (SubchDev).
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Guenther Hutzl <address@hidden>
---
hw/s390x/css.c | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index 9857eb3d6f..0229cb9412 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -854,7 +854,7 @@ static int css_interpret_ccw(SubchDev *sch, hwaddr ccw_addr,
return ret;
}
-static void sch_handle_start_func(SubchDev *sch, ORB *orb)
+static void sch_handle_start_func(SubchDev *sch)
{
PMCW *p = &sch->curr_status.pmcw;
@@ -868,10 +868,10 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
if (!(s->ctrl & SCSW_ACTL_SUSP)) {
/* Start Function triggered via ssch, i.e. we have an ORB */
+ ORB *orb = &sch->orb;
s->cstat = 0;
s->dstat = 0;
/* Look at the orb and try to execute the channel program. */
- assert(orb != NULL); /* resume does not pass an orb */
p->intparm = orb->intparm;
if (!(orb->lpm & path)) {
/* Generate a deferred cc 3 condition. */
@@ -885,8 +885,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
sch->ccw_no_data_cnt = 0;
suspend_allowed = !!(orb->ctrl0 & ORB_CTRL0_MASK_SPND);
} else {
- /* Start Function resumed via rsch, i.e. we don't have an
- * ORB */
+ /* Start Function resumed via rsch */
s->ctrl &= ~(SCSW_ACTL_SUSP | SCSW_ACTL_RESUME_PEND);
/* The channel program had been suspended before. */
suspend_allowed = true;
@@ -962,7 +961,7 @@ static void sch_handle_start_func(SubchDev *sch, ORB *orb)
* read/writes) asynchronous later on if we start supporting more than
* our current very simple devices.
*/
-static void do_subchannel_work(SubchDev *sch, ORB *orb)
+static void do_subchannel_work(SubchDev *sch)
{
SCSW *s = &sch->curr_status.scsw;
@@ -973,7 +972,7 @@ static void do_subchannel_work(SubchDev *sch, ORB *orb)
sch_handle_halt_func(sch);
} else if (s->ctrl & SCSW_FCTL_START_FUNC) {
/* Triggered by both ssch and rsch. */
- sch_handle_start_func(sch, orb);
+ sch_handle_start_func(sch);
} else {
/* Cannot happen. */
return;
@@ -1182,7 +1181,7 @@ int css_do_csch(SubchDev *sch)
s->ctrl &= ~(SCSW_CTRL_MASK_FCTL | SCSW_CTRL_MASK_ACTL);
s->ctrl |= SCSW_FCTL_CLEAR_FUNC | SCSW_ACTL_CLEAR_PEND;
- do_subchannel_work(sch, NULL);
+ do_subchannel_work(sch);
ret = 0;
out:
@@ -1223,7 +1222,7 @@ int css_do_hsch(SubchDev *sch)
}
s->ctrl |= SCSW_ACTL_HALT_PEND;
- do_subchannel_work(sch, NULL);
+ do_subchannel_work(sch);
ret = 0;
out:
@@ -1298,7 +1297,7 @@ int css_do_ssch(SubchDev *sch, ORB *orb)
s->ctrl |= (SCSW_FCTL_START_FUNC | SCSW_ACTL_START_PEND);
s->flags &= ~SCSW_FLAGS_MASK_PNO;
- do_subchannel_work(sch, orb);
+ do_subchannel_work(sch);
ret = 0;
out:
@@ -1578,7 +1577,7 @@ int css_do_rsch(SubchDev *sch)
}
s->ctrl |= SCSW_ACTL_RESUME_PEND;
- do_subchannel_work(sch, NULL);
+ do_subchannel_work(sch);
ret = 0;
out:
--
2.11.2
- [Qemu-devel] [PATCH v2 0/7] migration: s390x css migration, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 2/7] s390x: add helper get_machine_class, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 4/7] s390x/css: add missing css state conditionally, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 1/7] s390x: vmstatify config migration for virtio-ccw, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 3/7] s390x: add css_migration_enabled to machine class, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 6/7] s390x/css: activate ChannelSubSys migration, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 5/7] s390x/css: add ORB to SubchDev, Halil Pasic, 2017/05/29
- [Qemu-devel] [PATCH v2 7/7] s390x/css: use SubchDev.orb,
Halil Pasic <=
- Re: [Qemu-devel] [PATCH v2 0/7] migration: s390x css migration, Dr. David Alan Gilbert, 2017/05/31