[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] s390x/css: add ORB to SubchDev
From: |
Halil Pasic |
Subject: |
[Qemu-devel] [PATCH v2 5/7] s390x/css: add ORB to SubchDev |
Date: |
Mon, 29 May 2017 15:55:18 +0200 |
Since we are going to need a migration compatibility breaking change to
activate ChannelSubSys migration let us use the opportunity to introduce
ORB to the SubchDev before that (otherwise we would need separate
handling e.g. a compat property).
The ORB will be useful for implementing IDA, or async handling of
subchannel work.
Signed-off-by: Halil Pasic <address@hidden>
Reviewed-by: Guenther Hutzl <address@hidden>
---
hw/s390x/css.c | 35 +++++++++++++++++++++++++++++++++++
include/hw/s390x/css.h | 1 +
2 files changed, 36 insertions(+)
diff --git a/hw/s390x/css.c b/hw/s390x/css.c
index a15b58d303..e840dfba2a 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -163,6 +163,36 @@ static const VMStateDescription vmstate_sense_id = {
}
};
+static const VMStateDescription vmstate_orb = {
+ .name = "s390_orb",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_UINT32(intparm, ORB),
+ VMSTATE_UINT16(ctrl0, ORB),
+ VMSTATE_UINT8(lpm, ORB),
+ VMSTATE_UINT8(ctrl1, ORB),
+ VMSTATE_UINT32(cpa, ORB),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static bool vmstate_schdev_orb_needed(void *opaque)
+{
+ return css_migration_enabled();
+}
+
+static const VMStateDescription vmstate_schdev_orb = {
+ .name = "s390_subch_dev/orb",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .needed = vmstate_schdev_orb_needed,
+ .fields = (VMStateField[]) {
+ VMSTATE_STRUCT(orb, SubchDev, 1, vmstate_orb, ORB),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
static int subch_dev_post_load(void *opaque, int version_id);
static void subch_dev_pre_save(void *opaque);
@@ -187,6 +217,10 @@ const VMStateDescription vmstate_subch_dev = {
VMSTATE_BOOL(ccw_fmt_1, SubchDev),
VMSTATE_UINT8(ccw_no_data_cnt, SubchDev),
VMSTATE_END_OF_LIST()
+ },
+ .subsections = (const VMStateDescription * []) {
+ &vmstate_schdev_orb,
+ NULL
}
};
@@ -1253,6 +1287,7 @@ int css_do_ssch(SubchDev *sch, ORB *orb)
if (channel_subsys.chnmon_active) {
css_update_chnmon(sch);
}
+ sch->orb = *orb;
sch->channel_prog = orb->cpa;
/* Trigger the start function. */
s->ctrl |= (SCSW_FCTL_START_FUNC | SCSW_ACTL_START_PEND);
diff --git a/include/hw/s390x/css.h b/include/hw/s390x/css.h
index d74e44d312..e9c02af550 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -89,6 +89,7 @@ struct SubchDev {
bool thinint_active;
uint8_t ccw_no_data_cnt;
uint16_t migrated_schid; /* used for missmatch detection */
+ ORB orb;
/* transport-provided data: */
int (*ccw_cb) (SubchDev *, CCW1);
void (*disable_cb)(SubchDev *);
--
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 <=
- [Qemu-devel] [PATCH v2 7/7] s390x/css: use SubchDev.orb, Halil Pasic, 2017/05/29
- Re: [Qemu-devel] [PATCH v2 0/7] migration: s390x css migration, Dr. David Alan Gilbert, 2017/05/31