On Thu, May 04, 2017 at 12:47:58PM +0200, Cornelia Huck wrote: > [This should not conflict with the outstanding s390x pull request > which deals with LOADPARM and booting.] > > The following changes since commit e619b14746e5d8c0e53061661fd0e1da01fd4d60: > > Merge remote-tracking branch 'sthibault/tags/samuel-thibault' into staging (2017-05-02 15:16:29 +0100) > > are available in the git repository at: > > git://github.com/cohuck/qemu tags/s390x-3270-20170504 > > for you to fetch changes up to 9e8b3009b7dbe4c2f3e407999e30813122fa4af9: > > s390x/3270: Mark non-migratable and enable the device (2017-05-04 10:34:37 +0200) > > ---------------------------------------------------------------- > Basic support for using channel-attached 3270 'green-screen' > devices via tn3270. Actual handling of the data stream is > delegated to x3270; more info at http://wiki.qemu.org/Features/3270 > > ---------------------------------------------------------------- > > Jing Liu (6): > chardev: Basic support for TN3270 > s390x/css: Add an algorithm to find a free chpid > s390x/3270: 3270 data stream handling > s390x/3270: Add the TCP socket events handler for 3270 > s390x/3270: Detect for continued presence of a 3270 client > s390x/3270: Mark non-migratable and enable the device > > Yang Chen (2): > s390x/3270: Add abstract emulated ccw-attached 3270 device > s390x/3270: Add emulated terminal3270 device > > chardev/char-socket.c | 76 +++++++--- > chardev/char.c | 11 +- > default-configs/s390x-softmmu.mak | 1 + > hw/char/Makefile.objs | 1 + > hw/char/terminal3270.c | 293 ++++++++++++++++++++++++++++++++++++++ > hw/s390x/3270-ccw.c | 174 ++++++++++++++++++++++ > hw/s390x/Makefile.objs | 1 + > hw/s390x/css.c | 24 ++++ > include/hw/s390x/3270-ccw.h | 53 +++++++ > include/hw/s390x/css.h | 2 + > include/sysemu/char.h | 8 ++ > qapi-schema.json | 3 + > 12 files changed, 625 insertions(+), 22 deletions(-) > create mode 100644 hw/char/terminal3270.c > create mode 100644 hw/s390x/3270-ccw.c > create mode 100644 include/hw/s390x/3270-ccw.h > > -- > 2.11.0 > > Thanks, applied to my staging tree: https://github.com/stefanha/qemu/commits/staging Stefan