Commit 052888f0 authored by Thomas Huth's avatar Thomas Huth Committed by Cornelia Huck
Browse files

hw/s390x: Allow to configure the consoles with the "-serial" parameter 



The consoles ("sclpconsole" and "sclplmconsole") can only be configured
with "-device" and "-chardev" so far. Other machines use the convenience
option "-serial" to configure the default consoles, even for virtual
consoles like spapr-vty on the pseries machine. So let's support this
option on s390x, too. This way we can easily enable the serial console
here again with "-nodefaults", for example:

qemu-system-s390x -no-shutdown -nographic -nodefaults -serial mon:stdio

... which is way shorter than typing:

qemu-system-s390x -no-shutdown -nographic -nodefaults \
  -chardev stdio,id=c1,mux=on -device sclpconsole,chardev=c1 \
  -mon chardev=c1

The -serial parameter can also be used if you only want to see the QEMU
monitor on stdio without using -nodefaults, but not the console output.
That's something that is pretty impossible with the current code today:

qemu-system-s390x -no-shutdown -nographic -serial none

While we're at it, this patch also maps the second -serial option to the
"sclplmconsole", so that there is now an easy way to configure this second
console on s390x, too, for example:

qemu-system-s390x -no-shutdown -nographic -serial null -serial mon:stdio

Additionally, the new code is also smaller than the old one and we have
less s390x-specific code in vl.c :-)

I've also checked that migration still works as expected by migrating
a guest with console output back and forth between a qemu-system-s390x
that has this patch and an instance without this patch.

Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
Message-Id: <1524754794-28005-1-git-send-email-thuth@redhat.com>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Signed-off-by: default avatarCornelia Huck <cohuck@redhat.com>
parent e7c32461

hw/s390x/event-facility.c

+14 −0
Original line number Diff line number Diff line
@@ -543,3 +543,17 @@ static void register_types(void) 
}



type_init(register_types)



BusState *sclp_get_event_facility_bus(void)

{

    Object *busobj;

    SCLPEventsBus *sbus;



    busobj = object_resolve_path_type("", TYPE_SCLP_EVENTS_BUS, NULL);

    sbus = OBJECT_CHECK(SCLPEventsBus, busobj, TYPE_SCLP_EVENTS_BUS);

    if (!sbus) {

        return NULL;

    }



    return &sbus->qbus;

}

hw/s390x/s390-virtio-ccw.c

+17 −2
Original line number Diff line number Diff line
@@ -288,6 +288,15 @@ static void s390_create_virtio_net(BusState *bus, const char *name) 
    }

}



static void s390_create_sclpconsole(const char *type, Chardev *chardev)

{

    DeviceState *dev;



    dev = qdev_create(sclp_get_event_facility_bus(), type);

    qdev_prop_set_chr(dev, "chardev", chardev);

    qdev_init_nofail(dev);

}



static void ccw_init(MachineState *machine)

{

    int ret;
@@ -346,6 +355,14 @@ static void ccw_init(MachineState *machine) 
    /* Create VirtIO network adapters */

    s390_create_virtio_net(BUS(css_bus), "virtio-net-ccw");



    /* init consoles */

    if (serial_hd(0)) {

        s390_create_sclpconsole("sclpconsole", serial_hd(0));

    }

    if (serial_hd(1)) {

        s390_create_sclpconsole("sclplmconsole", serial_hd(1));

    }



    /* Register savevm handler for guest TOD clock */

    register_savevm_live(NULL, "todclock", 0, 1, &savevm_gtod, NULL);

}
@@ -470,10 +487,8 @@ static void ccw_machine_class_init(ObjectClass *oc, void *data) 
    mc->block_default_type = IF_VIRTIO;

    mc->no_cdrom = 1;

    mc->no_floppy = 1;

    mc->no_serial = 1;

    mc->no_parallel = 1;

    mc->no_sdcard = 1;

    mc->use_sclp = 1;

    mc->max_cpus = S390_MAX_CPUS;

    mc->has_hotpluggable_cpus = true;

    mc->get_hotplug_handler = s390_get_hotplug_handler;

include/hw/boards.h

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ struct MachineClass { 
    unsigned int no_serial:1,

        no_parallel:1,

        use_virtcon:1,

        use_sclp:1,

        no_floppy:1,

        no_cdrom:1,

        no_sdcard:1,

include/hw/s390x/event-facility.h

+2 −0
Original line number Diff line number Diff line
@@ -210,4 +210,6 @@ typedef struct SCLPEventFacilityClass { 
    bool (*event_pending)(SCLPEventFacility *ef);

} SCLPEventFacilityClass;



BusState *sclp_get_event_facility_bus(void);



#endif

tests/boot-serial-test.c

+1 −2
Original line number Diff line number Diff line
@@ -96,8 +96,7 @@ static testdef_t tests[] = { 
    { "sparc", "SS-4", "", "MB86904" },

    { "sparc", "SS-600MP", "", "TMS390Z55" },

    { "sparc64", "sun4u", "", "UltraSPARC" },

    { "s390x", "s390-ccw-virtio",

      "-nodefaults -device sclpconsole,chardev=serial0", "virtio device" },

    { "s390x", "s390-ccw-virtio", "", "virtio device" },

    { "m68k", "mcf5208evb", "", "TT", sizeof(kernel_mcf5208), kernel_mcf5208 },

    { "microblaze", "petalogix-s3adsp1800", "", "TT",

      sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 },