[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/40] s390x/css: add ORB to SubchDev
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 15/40] s390x/css: add ORB to SubchDev |
Date: |
Fri, 14 Jul 2017 12:40:42 +0200 |
From: Halil Pasic <address@hidden>
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>
Reviewed-by: Cornelia Huck <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <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 e9a0613..0768fec 100644
--- a/hw/s390x/css.c
+++ b/hw/s390x/css.c
@@ -165,6 +165,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);
@@ -193,6 +223,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
}
};
@@ -1386,6 +1420,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 dd36d39..8f08126 100644
--- a/include/hw/s390x/css.h
+++ b/include/hw/s390x/css.h
@@ -90,6 +90,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.7.4
- [Qemu-devel] [PULL 38/40] s390x/kvm: enable guarded storage, (continued)
- [Qemu-devel] [PULL 38/40] s390x/kvm: enable guarded storage, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 40/40] s390x/gdb: add gs registers, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 27/40] pc-bios/s390-ccw: Add virtio-net driver code, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 26/40] pc-bios/s390-ccw: Add core files for the network bootloading program, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 25/40] roms/SLOF: Update submodule to latest status, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 22/40] pc-bios/s390-ccw: Move byteswap functions to a separate header, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 19/40] pc-bios/s390-ccw: Move ebc2asc to sclp.c, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 23/40] pc-bios/s390-ccw: Remove unused structs from virtio.h, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 36/40] s390x/cpumodel: add esop/esop2 to z12 model, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 06/40] s390x/cpumodel: provide compat handling for new cpu features, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 15/40] s390x/css: add ORB to SubchDev,
Christian Borntraeger <=
- [Qemu-devel] [PULL 37/40] s390x/kvm: Enable KSS facility for nested virtualization, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 14/40] s390x/css: add missing css state conditionally, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 30/40] pc-bios/s390: rebuild s390-ccw.img, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 13/40] s390x: add css_migration_enabled to machine class, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 09/40] s390x/flic: introduce inject_airq callback, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 11/40] s390x/css: update css_adapter_interrupt, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 08/40] s390x/flic: introduce modify_ais_mode callback, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 21/40] pc-bios/s390-ccw: Add a write() function for stdio, Christian Borntraeger, 2017/07/14