Commit 9e8b3009 authored by Jing Liu's avatar Jing Liu Committed by Cornelia Huck
Browse files

s390x/3270: Mark non-migratable and enable the device 



Mark 3270 as non-migratable for the experimental stage. Enable
the 3270 device so that we can use x3270 client to operate the guest.

Run qemu with the arguments:
    -chardev socket,id=char3270_0,host=0.0.0.0,port=23,nowait,server,tn3270 \
    -device x-terminal3270,chardev=char3270_0,devno=fe.0.000a,id=terminal3270_0 \

There are some restrictions for the first stage: We don't support SSL
connections, multiple client connections and client resizing. Only
tested with the x3270 client.

Signed-off-by: default avatarJing Liu <liujbjl@linux.vnet.ibm.com>
Signed-off-by: default avatarYang Chen <bjcyang@linux.vnet.ibm.com>
Reviewed-by: default avatarQingFeng Hao <haoqf@linux.vnet.ibm.com>
Reviewed-by: default avatarDong Jia Shi <bjsdjshi@linux.vnet.ibm.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
parent e65a2720

default-configs/s390x-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ CONFIG_PCI=y 
CONFIG_VIRTIO_PCI=y

CONFIG_VIRTIO=y

CONFIG_SCLPCONSOLE=y

CONFIG_TERMINAL3270=y

CONFIG_S390_FLIC=y

CONFIG_S390_FLIC_KVM=$(CONFIG_KVM)

CONFIG_WDT_DIAG288=y

hw/char/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -29,3 +29,4 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o 
common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o



obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o

obj-$(CONFIG_TERMINAL3270) += terminal3270.o

hw/char/terminal3270.c

+6 −0
Original line number Diff line number Diff line
@@ -260,12 +260,18 @@ static Property terminal_properties[] = { 
    DEFINE_PROP_END_OF_LIST(),

};



static const VMStateDescription terminal3270_vmstate = {

    .name = TYPE_TERMINAL_3270,

    .unmigratable = 1,

};



static void terminal_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    EmulatedCcw3270Class *ck = EMULATED_CCW_3270_CLASS(klass);



    dc->props = terminal_properties;

    dc->vmsd = &terminal3270_vmstate;

    ck->init = terminal_init;

    ck->read_payload_3270 = read_payload_3270;

    ck->write_payload_3270 = write_payload_3270;