diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-06 11:42:59 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-06 11:42:59 +0100 |
| commit | b11365867568ba954de667a0bfe0945b8f78d6bd (patch) | |
| tree | 4699b4f24ef3d432566e07e2e11d036e28633150 /hw/s390x/3270-ccw.c | |
| parent | 67b9c5d4f37ea373ebf9aad251883886e34bf2e1 (diff) | |
| parent | 1045e3cdafaf1218d9f771080ba5c9d4f64346e4 (diff) | |
| download | qemu-b11365867568ba954de667a0bfe0945b8f78d6bd.zip qemu-b11365867568ba954de667a0bfe0945b8f78d6bd.tar.gz qemu-b11365867568ba954de667a0bfe0945b8f78d6bd.tar.bz2 | |
Merge remote-tracking branch 'remotes/borntraeger/tags/s390x-20170706' into staging
s390x/kvm/migration: fixes, enhancements and cleanups
- new email address for Cornelia
- Fixes: 3270, flic, virtio-scsi-ccw, ipl
- Enhancements, cpumodel, migration
# gpg: Signature made Thu 06 Jul 2017 08:18:19 BST
# gpg: using RSA key 0x117BBC80B5A61C7C
# gpg: Good signature from "Christian Borntraeger (IBM) <borntraeger@de.ibm.com>"
# Primary key fingerprint: F922 9381 A334 08F9 DBAB FBCA 117B BC80 B5A6 1C7C
* remotes/borntraeger/tags/s390x-20170706:
hw/s390x/ipl: Fix endianness problem with netboot_start_addr
virtio-scsi-ccw: use ioeventfd even when KVM is disabled
s390x: return unavailable features via query-cpu-definitions
s390x/MAINTAINERS: Update my email address
s390x: fix realize inheritance for kvm-flic
s390x: fix error propagation in kvm-flic's realize
s390x/3270: fix instruction interception handler
s390x: vmstatify config migration for virtio-ccw
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/s390x/3270-ccw.c')
| -rw-r--r-- | hw/s390x/3270-ccw.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/s390x/3270-ccw.c b/hw/s390x/3270-ccw.c index 6e6eee4..1554aa2 100644 --- a/hw/s390x/3270-ccw.c +++ b/hw/s390x/3270-ccw.c @@ -126,6 +126,7 @@ static void emulated_ccw_3270_realize(DeviceState *ds, Error **errp) sch->id.cu_type = EMULATED_CCW_3270_CU_TYPE; css_sch_build_virtual_schib(sch, (uint8_t)chpid, EMULATED_CCW_3270_CHPID_TYPE); + sch->do_subchannel_work = do_subchannel_work_virtual; sch->ccw_cb = emulated_ccw_3270_cb; ck->init(dev, &err); |